Changeset 22 for trunk

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

Location:

trunk

Files:

• DNSDB.pm (modified) (5 diffs)
• dns.cgi (modified) (6 diffs)
• templates/deldom.tmpl (modified) (1 diff)
• templates/delgrp.tmpl (modified) (1 diff)
• templates/domlist.tmpl (modified) (1 diff)
• templates/grpman.tmpl (modified) (1 diff)

trunk/DNSDB.pm

@@ -23 +23 @@
 @ISA            = qw(Exporter);
 @EXPORT_OK      = qw(
-        &initGlobals &connectDB &finish &addDomain &delDomain &domainName &addGroup &getChildren &groupName
-        &getSOA &getRecLine &getDomRecs &addRec &updateRec &delRec &domStatus
+        &initGlobals &connectDB &finish
+        &addDomain &delDomain &domainName
+        &addGroup &delGroup &getChildren &groupName
+        &getSOA &getRecLine &getDomRecs
+        &addRec &updateRec &delRec
+        &domStatus
         %typemap %reverse_typemap
         );
@@ -30 +34 @@
 @EXPORT         = (); # Export nothing by default.
 %EXPORT_TAGS    = ( ALL => [qw(
-                &initGlobals &connectDB &finish &addDomain &delDomain &domainName &addGroup &getChildren
-                &groupName &getSOA &getRecLine &getDomRecs &addRec &updateRec &delRec &domStatus
+                &initGlobals &connectDB &finish
+                &addDomain &delDomain &domainName
+                &addGroup &delGroup &getChildren &groupName
+                &getSOA &getRecLine &getDomRecs
+                &addRec &updateRec &delRec
+                &domStatus
                 %typemap %reverse_typemap
                 )]
@@ -225 +233 @@
     $sth->execute($domid);
 
+#die "full of fail\n";
     # once we get here, we should have suceeded.
-    $dbh->commit;
+#    $dbh->commit;
   }; # end eval
 
@@ -302 +311 @@
     }
 
-die "epic FAIL..  hahahah, just testing!\n";
     # once we get here, we should have suceeded.
     $dbh->commit;
@@ -316 +324 @@
 
 } # end addGroup()
+
+
+## DNSDB::delGroup()
+# Delete a group.
+# Takes a group ID
+# Returns a status code and message
+sub delGroup {
+  my $dbh = shift;
+  my $groupid = shift;
+
+  # Allow transactions, and raise an exception on errors so we can catch it later.
+  # Use local to make sure these get "reset" properly on exiting this block
+  local $dbh->{AutoCommit} = 0;
+  local $dbh->{RaiseError} = 1;
+
+##fixme:  locate "knowable" error conditions and deal with them before the eval
+# -> domains still exist in group
+# -> ...
+
+  # Wrap all the SQL in a transaction
+  eval {
+    my $sth = $dbh->prepare("delete from default_records where group_id=?");
+    $sth->execute($groupid);
+    $sth = $dbh->prepare("delete from groups where group_id=?");
+    $sth->execute($groupid);
+
+die "epic group fail FTW!\n";
+    # once we get here, we should have suceeded.
+    $dbh->commit;
+  }; # end eval
+
+  if ($@) {
+    my $msg = $@;
+    eval { $dbh->rollback; };
+    return ('FAIL',$msg);
+  } else {
+    return ('OK','OK');
+  }
+} # end delGroup()
 
 

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;

trunk/templates/deldom.tmpl

@@ -9 +9 @@
 
 <TMPL_ELSE>
- <TMPL_IF del_failed>
+ <!-- <TMPL_IF del_failed>
   <div class='errmsg'>Error deleting domain <TMPL_VAR NAME=domain>: <TMPL_VAR NAME=errmsg></div>
- </TMPL_IF>
+ </TMPL_IF> -->
  <TMPL_INCLUDE NAME="domlist.tmpl">
 </TMPL_IF>

trunk/templates/delgrp.tmpl

@@ -10 +10 @@
 
 <TMPL_ELSE>
- <TMPL_IF del_failed>
+ <!-- <TMPL_IF del_failed>
   <div class='errmsg'>Error deleting group <TMPL_VAR NAME=groupname>: <TMPL_VAR NAME=errmsg></div>
- </TMPL_IF>
+ </TMPL_IF> -->
  <TMPL_INCLUDE NAME="grpman.tmpl">
 </TMPL_IF>

trunk/templates/domlist.tmpl

@@ -4 +4 @@
 
 <td align="center">
+
+ <TMPL_IF del_failed>
+  <div class='errmsg'>Error deleting domain <TMPL_VAR NAME=domain>: <TMPL_VAR NAME=errmsg></div>
+ </TMPL_IF>
+
 <table width="98%">
 <tr><td colspan=3 align=center>Domain list</td></tr>

trunk/templates/grpman.tmpl

@@ -4 +4 @@
 
 <td align="center">
+
+ <TMPL_IF del_failed>
+  <div class='errmsg'>Error deleting group <TMPL_VAR NAME=groupname>: <TMPL_VAR NAME=errmsg></div>
+ </TMPL_IF>
+
 <table width="98%">
 <tr><td colspan=3 align=center><span class="pgtitle">Manage groups</span></td></tr>