Changeset 22 for trunk/dns.cgi

Timestamp:

10/15/09 17:50:22 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint - basic group management should be complete

• fiddled HTML so that group-delete and domain-delete errors don't sit on top of the menu column

File:

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

trunk/dns.cgi

@@ -165 +165 @@
       $page->param(del_failed => 1);
       $page->param(errmsg => $msg);
+      listdomains($curgroup);
     } else {
       # success.  go back to the domain list, do not pass "GO"
@@ -365 +366 @@
 } elsif ($webvar{page} eq 'grpman') {
 
-  my $sth = $dbh->prepare("select count(*) from groups");
-  $sth->execute;
-  my ($count) = ($sth->fetchrow_array);
-
-# fill page count and first-previous-next-last-all bits
-##fixme - hardcoded group bit
-  fill_pgcount($count,"groups",'');
-  fill_fpnla($count);
-
-  my @grouplist;
-  $sth = $dbh->prepare("SELECT g.group_id, g.group_name, g2.group_name, ".
-        "count(distinct(u.email)), count(distinct(d.domain)) ".
-        "FROM groups g ".
-        "INNER JOIN groups g2 ON g2.group_id=g.parent_group_id ".
-        "LEFT OUTER JOIN users u ON u.group_id=g.group_id ".
-        "LEFT OUTER JOIN domains d ON d.group_id=g.group_id ".
-        "GROUP BY g.group_id, g.group_name, g2.group_name ".
-        "ORDER BY g.group_id".($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage));
-  $sth->execute;
-
-  my $rownum = 0;
-  while (my @data = $sth->fetchrow_array) {
-    my %row;
-    $row{groupid} = $data[0];
-    $row{groupname} = $data[1];
-    $row{pgroup} = $data[2];
-    $row{nusers} = $data[3];
-    $row{ndomains} = $data[4];
-    $row{bg} = ($rownum++)%2;
-    $row{sid} = $sid;
-    push @grouplist, \%row;
-  }
-  $page->param(grouptable => \@grouplist);
-
+  listgroups();
   $page->param(curpage => $webvar{page});
 
@@ -418 +386 @@
   }
 
-} elsif ($webvar{page} eq 'delgroup') {
+} elsif ($webvar{page} eq 'delgrp') {
 
   $page->param(id => $webvar{id});
@@ -436 +404 @@
       $page->param(del_failed => 1);
       $page->param(errmsg => $msg);
+      $page->param(curpage => $webvar{page});
+      listgroups();
     } else {
       # success.  go back to the domain list, do not pass "GO"
@@ -646 +616 @@
 
 sub listdomains {
-
   my $sth = $dbh->prepare("SELECT count(*) FROM domains WHERE group_id=?");
   $sth->execute($curgroup);
@@ -683 +652 @@
 
 
+sub listgroups {
+  my $sth = $dbh->prepare("select count(*) from groups");
+  $sth->execute;
+  my ($count) = ($sth->fetchrow_array);
+
+# fill page count and first-previous-next-last-all bits
+##fixme - hardcoded group bit
+  fill_pgcount($count,"groups",'');
+  fill_fpnla($count);
+
+  my @grouplist;
+  $sth = $dbh->prepare("SELECT g.group_id, g.group_name, g2.group_name, ".
+        "count(distinct(u.email)), count(distinct(d.domain)) ".
+        "FROM groups g ".
+        "INNER JOIN groups g2 ON g2.group_id=g.parent_group_id ".
+        "LEFT OUTER JOIN users u ON u.group_id=g.group_id ".
+        "LEFT OUTER JOIN domains d ON d.group_id=g.group_id ".
+        "GROUP BY g.group_id, g.group_name, g2.group_name ".
+        "ORDER BY g.group_id".($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage));
+  $sth->execute;
+
+  my $rownum = 0;
+  while (my @data = $sth->fetchrow_array) {
+    my %row;
+    $row{groupid} = $data[0];
+    $row{groupname} = $data[1];
+    $row{pgroup} = $data[2];
+    $row{nusers} = $data[3];
+    $row{ndomains} = $data[4];
+    $row{bg} = ($rownum++)%2;
+    $row{sid} = $sid;
+    push @grouplist, \%row;
+  }
+  $page->param(grouptable => \@grouplist);
+} # end listgroups()
+
+
 sub fill_grouplist {
   my $template_var = shift;