Changeset 43 for trunk/dns.cgi

Timestamp:

12/09/09 17:08:46 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix grouplist brokenness in menu (first entry was being set to current group

instead of login group)
-> may be a way to compress that further

Compact and generalize process of filling table headings for lists - users,

domains, groups; records should be able to use this too

File:

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

trunk/dns.cgi

@@ -651 +651 @@
   $page->param(group => $curgroup);
   $page->param(groupname => groupName($dbh,$curgroup));
+  $page->param(logingrp => groupName($dbh,$logingroup));
 
   # group tree.  should go elsewhere, probably
@@ -1044 +1045 @@
 my @cols = ('group','parent','nusers','ndomains');
 
+my %colnames = (group => 'Group', parent => 'Parent Group', nusers => 'Users', ndomains => 'Domains');
+
+fill_colheads(\@cols, \%colnames);
+
+if (0) {
 my @headings;
 
   $sortorder = $webvar{sortorder} if $webvar{sortorder};
-foreach my $colhead (@cols) {
+foreach my $col (@cols) {
   my %coldata;
-  $coldata{firstcol} = 1 if $colhead eq $cols[0];
+  $coldata{firstcol} = 1 if $col eq $cols[0];
   $coldata{sid} = $sid;
   $coldata{page} = $webvar{page};
   $coldata{offset} = $webvar{offset} if $webvar{offset};
-  $coldata{sortby} = $colhead;
-  if ($colhead eq $sortby) {
-push @debugbits, "$colhead $sortby $sortorder<br>\n";
+  $coldata{sortby} = $col;
+  $coldata{colname} = $colnames{$col};
+  if ($col eq $sortby) {
     $coldata{order} = ($sortorder eq 'ASC' ? 'DESC' : 'ASC');
     $coldata{sortorder} = $sortorder;
@@ -1065 +1071 @@
 
 $page->param(colheads => \@headings);
+
+} # temp
 
   my @grouplist;
@@ -1157 +1165 @@
   $page->param(usertable => \@userlist);
 }
+
+# Generate all of the glop necessary to add or not the appropriate marker/flag for
+# the sort order and column in domain, user, group, and record lists
+# Takes an array ref and hash ref
+sub fill_colheads {
+  my $cols = shift;
+  my $colnames = shift;
+
+  my @headings;
+
+  foreach my $col (@$cols) {
+    my %coldata;
+    $coldata{firstcol} = 1 if $col eq $cols->[0];
+    $coldata{sid} = $sid;
+    $coldata{page} = $webvar{page};
+    $coldata{offset} = $webvar{offset} if $webvar{offset};
+    $coldata{sortby} = $col;
+    $coldata{colname} = $colnames->{$col};
+    if ($col eq $sortby) {
+      $coldata{order} = ($sortorder eq 'ASC' ? 'DESC' : 'ASC');
+      $coldata{sortorder} = $sortorder;
+    } else {
+      $coldata{order} = 'ASC';
+    }
+    push @headings, \%coldata;
+  }
+
+  $page->param(colheads => \@headings);
+
+} # end gentableheadings