Changeset 44 for trunk/dns.cgi

Timestamp:

12/09/09 18:02:18 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up header-munger code and templates for users, groups, domains
Still need to convert record list to use general-case

File:

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

trunk/dns.cgi

@@ -922 +922 @@
   $sortorder = $webvar{order} if $webvar{order};
 
-if ($sortby eq 'domain') {
-  $page->param(domorder => ($sortorder eq 'ASC' ? 'DESC' : 'ASC'));
-  $page->param(statorder => 'ASC');
-  $page->param(grporder => 'ASC');
-  $page->param(sortdomain => 1);
-} elsif ($sortby eq 'status') {
-  $page->param(domorder => 'ASC');
-  $page->param(statorder => ($sortorder eq 'ASC' ? 'DESC' : 'ASC'));
-  $page->param(grporder => 'ASC');
-  $page->param(sortstatus => 1);
-} elsif ($sortby eq 'group') {
-  $page->param(domorder => 'ASC');
-  $page->param(statorder => 'ASC');
-  $page->param(grporder => ($sortorder eq 'ASC' ? 'DESC' : 'ASC'));
-  $page->param(sortgroup => 1);
-} else {
-  $page->param(domorder => 'ASC');
-  $page->param(statorder => 'ASC');
-  $page->param(grporder => 'ASC');
-}
+# set up the headers
+  my @cols = ('domain', 'status', 'group');
+  my %colheads = (domain => 'Domain', status => 'Status', group => 'Group');
+  fill_colheads(\@cols, \%colheads);
 
   $page->param(sortorder => $sortorder);
@@ -1007 +991 @@
   $sortorder = $webvar{order} if $webvar{order};
 
-if (0){
-##fixme: yick
-  if ($sortby eq 'group') {
-    $page->param(grporder => ($sortorder eq 'ASC' ? 'DESC' : 'ASC'));
-    $page->param(parentorder => 'ASC');
-    $page->param(nusersorder => 'ASC');
-    $page->param(ndomainsorder => 'ASC');
-    $page->param(sortgrp => 1);
-  } elsif ($sortby eq 'parent') {
-    $page->param(grporder => 'ASC');
-    $page->param(parentorder => ($sortorder eq 'ASC' ? 'DESC' : 'ASC'));
-    $page->param(nusersorder => 'ASC');
-    $page->param(ndomainsorder => 'ASC');
-    $page->param(sortparent => 1);
-  } elsif ($sortby eq 'nusers') {
-    $page->param(grporder => 'ASC');
-    $page->param(parentorder => 'ASC');
-    $page->param(nusersorder => ($sortorder eq 'ASC' ? 'DESC' : 'ASC'));
-    $page->param(ndomainsorder => 'ASC');
-    $page->param(sortnusers => 1);
-  } elsif ($sortby eq 'ndomains') {
-    $page->param(grporder => 'ASC');
-    $page->param(parentorder => 'ASC');
-    $page->param(nusersorder => 'ASC');
-    $page->param(ndomainsorder => ($sortorder eq 'ASC' ? 'DESC' : 'ASC'));
-    $page->param(sortndomains => 1);
-  } else {
-    $page->param(grporder => 'ASC');
-    $page->param(parentorder => 'ASC');
-    $page->param(nusersorder => 'ASC');
-    $page->param(ndomainsorder => 'ASC');
-  }
-
-  $page->param(sortorder => $sortorder);
-}
-
-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 $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);
-
-} # temp
+# set up the headers
+  my @cols = ('group','parent','nusers','ndomains');
+  my %colnames = (group => 'Group', parent => 'Parent Group', nusers => 'Users', ndomains => 'Domains');
+  fill_colheads(\@cols, \%colnames);
 
   my @grouplist;
@@ -1141 +1063 @@
   fill_fpnla($count);
 
+  $sortby = 'user';
+# sort/order
+  $sortby = $webvar{sortby} if $webvar{sortby};
+  $sortorder = $webvar{order} if $webvar{order};
+
+# set up the headers
+  my @cols = ('user','fname','type','group','status');
+  my %colnames = (user => 'Username', fname => 'Full Name', type => 'Type', group => 'Group', status => 'Status');
+  fill_colheads(\@cols, \%colnames);
+
   my @userlist;
   $sth = $dbh->prepare("SELECT u.user_id, u.username, u.firstname, u.lastname, u.type, g.group_name, u.status ".