Changeset 51 for trunk/dns.cgi

Timestamp:

12/17/09 15:47:50 (14 years ago)

Author:

Kris Deugau

Message:

/dev

checkpoint
Moved sort order/sort-by tracking on domain, user, and group lists into session
Fixed user activation/deactivation and display
Copy-pasted bits for letter-search and filtering from domains to user and group lists

File:

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

trunk/dns.cgi

@@ -50 +50 @@
   $session->param('logingroup',1);
   $session->param('curgroup',1);        # yes, we *do* need to track this too.  er, probably.
+  $session->param('domlistsortby','domain');
+  $session->param('domlistorder','ASC');
+  $session->param('useradminsortby','username');
+  $session->param('useradminorder','ASC');
+  $session->param('grpmansortby','group');
+  $session->param('grpmanorder','ASC');
+  $session->param('reclistsortby','name');
+  $session->param('reclistorder','ASC');
 }
 
@@ -470 +478 @@
 } elsif ($webvar{page} eq 'useradmin') {
 
+  if (defined($webvar{action})) {
+    userStatus($dbh,$webvar{id},$webvar{action});
+  }
+
+  $page->param(curpage => $webvar{page});
+
   list_users();
-  $page->param(curpage => $webvar{page});
 
 } elsif ($webvar{page} eq 'newuser') {
@@ -966 +979 @@
 
 # sort/order
-  $sortby= $webvar{sortby} if $webvar{sortby};
-  $sortorder = $webvar{order} if $webvar{order};
+  $session->param($webvar{page}.'sortby', $webvar{sortby}) if $webvar{sortby};
+  $session->param($webvar{page}.'order', $webvar{order}) if $webvar{order};
+
+  $sortby = $session->param($webvar{page}.'sortby');
+  $sortorder = $session->param($webvar{page}.'order');
 
 # set up the headers
@@ -979 +995 @@
   $sortorder = ($sortorder eq 'ASC' ? 'DESC' : 'ASC') if $sortby eq 'status';
 
+# waffle, waffle - keep state on these as well as sortby, sortorder?
   $page->param("start$webvar{startwith}" => 1) if $webvar{startwith} && $webvar{startwith} =~ /^[a-z]$/;
 
@@ -1033 +1050 @@
   fill_fpnla($count);
 
-  $sortby = 'group';
+#  $sortby = 'group';
 # sort/order
-  $sortby = $webvar{sortby} if $webvar{sortby};
-  $sortorder = $webvar{order} if $webvar{order};
+  $session->param($webvar{page}.'sortby', $webvar{sortby}) if $webvar{sortby};
+  $session->param($webvar{page}.'order', $webvar{order}) if $webvar{order};
+
+  $sortby = $session->param($webvar{page}.'sortby');
+  $sortorder = $session->param($webvar{page}.'order');
 
 # set up the headers
@@ -1043 +1063 @@
   fill_colheads(\@cols, \%colnames);
 
+# waffle, waffle - keep state on these as well as sortby, sortorder?
+  $page->param("start$webvar{startwith}" => 1) if $webvar{startwith} && $webvar{startwith} =~ /^[a-z]$/;
+
+  $page->param(filter => $webvar{filter}) if $webvar{filter};
+
+# munge sortby for columns in database
+  $sortby = 'g.group_name' if $sortby eq 'group';
+  $sortby = 'g2.group_name' if $sortby eq 'parent';
+
   my @grouplist;
   $sth = $dbh->prepare("SELECT g.group_id, g.group_name, g2.group_name, ".
-        "count(distinct(u.username)), count(distinct(d.domain)) ".
+        "count(distinct(u.username)) AS nusers, count(distinct(d.domain)) AS ndomains ".
         "FROM groups g ".
         "INNER JOIN groups g2 ON g2.group_id=g.parent_group_id ".
@@ -1051 +1080 @@
         "LEFT OUTER JOIN domains d ON d.group_id=g.group_id ".
         "WHERE g.group_id IN ($logingroup".($childlist ? ",$childlist" : '').") ".
-        "GROUP BY g.group_id, g.group_name, g2.group_name ".
-        "ORDER BY g.group_id".($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage));
+##fixme:  don't do variable subs in SQL, use placeholders and params in ->execute()
+        (defined($webvar{startwith}) ? " AND g.group_name ~* '^[$webvar{startwith}]'" : '').
+        (defined($webvar{filter}) ? " AND g.group_name ~* '$webvar{filter}'" : '').
+        " GROUP BY g.group_id, g.group_name, g2.group_name ".
+        " ORDER BY $sortby $sortorder ".
+        ($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage));
   $sth->execute;
 
+push @debugbits, $sth->errstr;
   my $rownum = 0;
   while (my @data = $sth->fetchrow_array) {
@@ -1110 +1144 @@
   fill_fpnla($count);
 
-  $sortby = 'user';
+#  $sortby = 'user';
 # sort/order
-  $sortby = $webvar{sortby} if $webvar{sortby};
-  $sortorder = $webvar{order} if $webvar{order};
+  $session->param($webvar{page}.'sortby', $webvar{sortby}) if $webvar{sortby};
+  $session->param($webvar{page}.'order', $webvar{order}) if $webvar{order};
+
+  $sortby = $session->param($webvar{page}.'sortby');
+  $sortorder = $session->param($webvar{page}.'order');
 
 # set up the headers
@@ -1120 +1157 @@
   fill_colheads(\@cols, \%colnames);
 
+# waffle, waffle - keep state on these as well as sortby, sortorder?
+  $page->param("start$webvar{startwith}" => 1) if $webvar{startwith} && $webvar{startwith} =~ /^[a-z]$/;
+
+  $page->param(filter => $webvar{filter}) if $webvar{filter};
+
+# munge sortby for columns in database
+  $sortby = 'u.username' if $sortby eq 'user';
+  $sortby = 'u.type' if $sortby eq 'type';
+  $sortby = 'g.group_name' if $sortby eq 'group';
+  $sortby = 'u.status' if $sortby eq 'status';
+
   my @userlist;
-  $sth = $dbh->prepare("SELECT u.user_id, u.username, u.firstname, u.lastname, u.type, g.group_name, u.status ".
+  $sth = $dbh->prepare("SELECT u.user_id, u.username, u.firstname || ' ' || u.lastname AS fname, u.type, g.group_name, u.status ".
         "FROM users u ".
         "INNER JOIN groups g ON u.group_id=g.group_id ".
         "WHERE u.group_id=?".
+##fixme:  don't do variable subs in SQL, use placeholders and params in ->execute()
+        (defined($webvar{startwith}) ? " AND u.username ~* '^[$webvar{startwith}]'" : '').
+        (defined($webvar{filter}) ? " AND u.username ~* '$webvar{filter}'" : '').
+        " ORDER BY $sortby $sortorder ".
         ($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage));
+
+#       " GROUP BY g.group_id, g.group_name, g2.group_name ".
+#       ($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage));
+
   $sth->execute($curgroup);
 
@@ -1134 +1190 @@
     $row{userid} = $data[0];
     $row{username} = $data[1];
-    $row{userfull} = "$data[2] $data[3]";
-    $row{usertype} = ($data[4] eq 'S' ? 'superuser' : "user");
-    $row{usergroup} = $data[5];
-    $row{mkactive} = $data[6];
+    $row{userfull} = $data[2];
+    $row{usertype} = ($data[3] eq 'S' ? 'superuser' : "user");
+    $row{usergroup} = $data[4];
+    $row{active} = $data[5];
     $row{bg} = ($rownum++)%2;
     $row{sid} = $sid;