Changeset 117 for trunk/dns.cgi

Timestamp:

09/01/11 15:55:00 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Add getParents (untested) and isParent (tested) subs
Add some supporting hashes for entity -> parent(entity)

relationships in the database - private to DNSDB.pm

Rename tmp_ruri to uri_self for clarity and reuse
Move uri_self munging from ##common area so that more

subs can use it

Update group tree to change the current group by clicking

the group name. Working comments need to be cleaned up
and choose-a-group dropdown removed from the menu

File:

• trunk/dns.cgi (modified) (6 diffs)

trunk/dns.cgi

@@ -99 +99 @@
 my $footer = HTML::Template->new(filename => "$templatedir/footer.tmpl");
 
+## set up "URL to self"
+# @#$%@%@#% XHTML - & in a URL must be escaped.  >:(
+my $uri_self = $ENV{REQUEST_URI};
+$uri_self =~ s/\&([a-z])/\&amp\;$1/g;
+
+# le sigh.  and we need to strip any previous action
+$uri_self =~ s/\&action=[^&]+//g;
+
+# and search filter options.  these get stored in the session, but discarded
+# as soon as you switch to a different page.
+##fixme:  think about retaining these on a per-page basis, as well as offset;  same as the sort-order bits
+no warnings qw(uninitialized);
+$uri_self =~ s/\&startwith=[a-z09-]*(\&)?/$1/g;
+$uri_self =~ s/\&searchsubs=[a-z09-]*(\&)?/$1/g;
+$uri_self =~ s/\&filter=[a-z09-]*(\&)?/$1/g;
+use warnings qw(uninitialized);
+
 # default
 #my $perpage = 15;
@@ -160 +177 @@
     # fiddle session-stored group data
     # magic incantation to... uhhh...
+
+    # ... and the "change group" bits...
+    $uri_self =~ s/\&group=[^&]*//g;
+
     $session->param('curgroup', $webvar{group});
     $curgroup = ($webvar{group} ? $webvar{group} : $session->param('curgroup'));
@@ -1212 +1233 @@
   $page->param(groupname => groupName($dbh,$curgroup));
   $page->param(logingrp => groupName($dbh,$logingroup));
+  $page->param(logingrp_num => $logingroup);
 
   $page->param(mayimport => $permissions{admin} || $permissions{domain_create});
@@ -1225 +1247 @@
   fill_grouplist("grouplist");
 
-## set up "URL to self"
-# @#$%@%@#% XHTML - & in a URL must be escaped.  >:(
-  my $tmp_ruri = $ENV{REQUEST_URI};
-  $tmp_ruri =~ s/\&([a-z])/\&amp\;$1/g;
-
-# le sigh.  and we need to strip any previous action
-  $tmp_ruri =~ s/\&action=[^&]+//g;
-
-# and search filter options.  these get stored in the session, but discarded
-# as soon as you switch to a different page.
-##fixme:  think about retaining these on a per-page basis, as well as offset;  same as the sort-order bits
-  no warnings qw(uninitialized);
-  $tmp_ruri =~ s/\&startwith=[a-z09-]*(\&)?/$1/g;
-  $tmp_ruri =~ s/\&searchsubs=[a-z09-]*(\&)?/$1/g;
-  $tmp_ruri =~ s/\&filter=[a-z09-]*(\&)?/$1/g;
-  use warnings qw(uninitialized);
-
 # fill in the URL-to-self
-  $page->param(whereami => $tmp_ruri);
+  $page->param(whereami => $uri_self);
 }
 
@@ -1292 +1297 @@
     my %row;
     $row{grpname} = groupName($dbh,$_);
+    $row{grpnum} = $_;
+    $row{whereami} = $uri_self;
         # for all that HTML::Template is supposed to keep the HTML out of the Perl, this is so much more compact...
-    $row{grpdisp} = ($_ == $cur ? "<b>$row{grpname}</b>" : $row{grpname});
+#    $row{grpdisp} = ($_ == $cur ? "<b>$row{grpname}</b>" : $row{grpname});
+$row{curgrp} = ($_ == $cur);
+$row{expanded} = isParent($dbh, $_, 'group', $cur, 'group');
+$row{expanded} = 1 if $_ == $cur;
     $row{subs} = fill_grptree($_,$cur,$indent.'    ');
     $row{indent} = $indent;
@@ -1691 +1701 @@
   my $childlist = join(',',@childgroups);
 
+##fixme:  need to reorder list so that we can display a pseudotree in group dropdowns
+
   # weesa gonna discard parent_group_id for now
   my $sth = $dbh->prepare("SELECT group_id,parent_group_id,group_name FROM groups ".