Changeset 293

Timestamp:

03/27/12 17:11:59 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Move action logging for delGroup() into DNSDB.pm. See #35.
Extend checks for Things in the group a little
Delete default reverse records as well

Location:

trunk

Files:

• DNSDB.pm (modified) (2 diffs)
• dns.cgi (modified) (1 diff)

trunk/DNSDB.pm

@@ -1849 +1849 @@
 # -> ...
   my $failmsg = '';
+  my $resultmsg = '';
+
+  # collect some pieces for logging and error messages
+  my $groupname = groupName($dbh,$groupid);
+  my $parid = parentID($dbh, (id => $groupid, type => 'group'));
 
   # Wrap all the SQL in a transaction
   eval {
-    my $sth = $dbh->prepare("SELECT count(*) FROM domains WHERE group_id=?");
-    $sth->execute($groupid);
-    my ($domcnt) = $sth->fetchrow_array;
-    $failmsg = "Can't remove group ".groupName($dbh,$groupid);
+    # Check for Things in the group
+    $failmsg = "Can't remove group $groupname";
+    my ($grpcnt) = $dbh->selectrow_array("SELECT count(*) FROM groups WHERE parent_group_id=?", undef, ($groupid));
+    die "$grpcnt groups still in group\n" if $grpcnt;
+    my ($domcnt) = $dbh->selectrow_array("SELECT count(*) FROM domains WHERE group_id=?", undef, ($groupid));
     die "$domcnt domains still in group\n" if $domcnt;
-
-    $sth = $dbh->prepare("delete from default_records where group_id=?");
-    $failmsg = "Failed to delete default records for ".groupName($dbh,$groupid);
-    $sth->execute($groupid);
-    $sth = $dbh->prepare("delete from groups where group_id=?");
-    $failmsg = "Failed to remove group ".groupName($dbh,$groupid);
-    $sth->execute($groupid);
+    my ($usercnt) = $dbh->selectrow_array("SELECT count(*) FROM users WHERE group_id=?", undef, ($groupid));
+    die "$usercnt users still in group\n" if $usercnt;
+
+    $failmsg = "Failed to delete default records for $groupname";
+    $dbh->do("DELETE from default_records WHERE group_id=?", undef, ($groupid));
+    $failmsg = "Failed to delete default reverse records for $groupname";
+    $dbh->do("DELETE from default_rev_records WHERE group_id=?", undef, ($groupid));
+    $failmsg = "Failed to remove group $groupname";
+    $dbh->do("DELETE from groups WHERE group_id=?", undef, ($groupid));
+
+    _log($dbh, (group_id => $parid, entry => "Deleted group $groupname"));
+    $resultmsg = "Deleted group $groupname";
 
     # once we get here, we should have suceeded.
@@ -1872 +1883 @@
     my $msg = $@;
     eval { $dbh->rollback; };
+    if ($config{log_failures}) {
+      _log($dbh, (group_id => $parid, entry => "$failmsg: $msg"));
+      $dbh->commit;     # since we enabled transactions earlier
+    }
     return ('FAIL',"$failmsg: $msg");
-  } else {
-    return ('OK','OK');
-  }
+  }
+
+  return ('OK',$resultmsg);
 } # end delGroup()
 

trunk/dns.cgi

@@ -974 +974 @@
 
   } elsif ($webvar{del} eq 'ok') {
-    my $deleteme = groupName($dbh,$webvar{id}); # get this before we delete it...
-    my $delparent = parentID($dbh, (id => $webvar{id}, type => 'group'));
     my ($code,$msg) = delGroup($dbh, $webvar{id});
     if ($code eq 'OK') {
 ##fixme: need to clean up log when deleting a major container
-      logaction(0, $session->param("username"), $delparent, "Deleted group $deleteme");
-      changepage(page => "grpman", resultmsg => "Deleted group $deleteme");
+      changepage(page => "grpman", resultmsg => $msg);
     } else {
 # need to find failure mode
-      logaction(0, $session->param("username"), $delparent, "Failed to delete group $deleteme: $msg")
-        if $config{log_failures};
-      changepage(page => "grpman", errmsg => "Error deleting group $deleteme: $msg");
+      changepage(page => "grpman", errmsg => $msg);
     }
   } else {