Index: trunk/dns.cgi
===================================================================
--- trunk/dns.cgi	(revision 185)
+++ trunk/dns.cgi	(revision 187)
@@ -373,10 +373,10 @@
     my $dom = domainName($dbh, $webvar{id});
     my ($code,$msg) = delDomain($dbh, $webvar{id});
-    if ($code ne 'OK') {
+    if ($code eq 'OK') {
+      logaction($webvar{id}, $session->param("username"), $pargroup, "Deleted domain $dom");
+      changepage(page => "domlist", resultmsg => "Deleted domain $dom");
+    } else {
       logaction($webvar{id}, $session->param("username"), $pargroup, "Failed to delete domain $dom ($msg)");
       changepage(page => "domlist", errmsg => "Error deleting domain $dom: $msg");
-    } else {
-      logaction($webvar{id}, $session->param("username"), $pargroup, "Deleted domain $dom");
-      changepage(page => "domlist", resultmsg => "Deleted domain $dom");
     }
 
@@ -643,5 +643,16 @@
     my $rec = getRecLine($dbh,$webvar{defrec},$webvar{id});
     my ($code,$msg) = delRec($dbh,$webvar{defrec},$webvar{id});
-    if ($code ne 'OK') {
+    if ($code eq 'OK') {
+      if ($webvar{defrec} eq 'y') {
+##fixme:  log distance for MX;  log port/weight/distance for SRV
+	my $restr = "Deleted default record '$rec->{host} $typemap{$rec->{type}} $rec->{val}', TTL $rec->{ttl}";
+	logaction(0, $session->param("username"), $rec->{parid}, $restr);
+	changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec}, resultmsg => $restr);
+      } else {
+	my $restr = "Deleted record '$rec->{host} $typemap{$rec->{type}} $rec->{val}', TTL $rec->{ttl}";
+	logaction($rec->{parid}, $session->param("username"), parentID($rec->{parid}, 'dom', 'group'), $restr);
+	changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec}, resultmsg => $restr);
+      }
+    } else {
 ## need to find failure mode
       if ($webvar{defrec} eq 'y') {
@@ -655,17 +666,4 @@
       changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec},
 		errmsg => "Error deleting record: $msg");
-#      $page->param(del_failed => 1);
-#      $page->param(errmsg => $msg);
-#      showdomain($webvar{defrec}, $webvar{parentid});
-    } else {
-      if ($webvar{defrec} eq 'y') {
-	my $restr = "Deleted default record '$rec->{host} $typemap{$rec->{type}} $rec->{val}', TTL $rec->{ttl}";
-	logaction(0, $session->param("username"), $rec->{parid}, $restr);
-	changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec}, resultmsg => $restr);
-      } else {
-	my $restr = "Deleted record '$rec->{host} $typemap{$rec->{type}} $rec->{val}', TTL $rec->{ttl}";
-	logaction($rec->{parid}, $session->param("username"), parentID($rec->{parid}, 'dom', 'group'), $restr);
-	changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec}, resultmsg => $restr);
-      }
     }
   } else {
@@ -808,5 +806,6 @@
 	changepage(page => "grpman", resultmsg => "Added group $webvar{newgroup}");
       }
-    }
+    } # fallthrough else
+    logaction(0, $session->param("username"), $webvar{pargroup}, "Failed to add group $webvar{newgroup}: $msg");
     # no point in doing extra work
     fill_permissions($page, \%newperms);
@@ -842,22 +841,16 @@
 # up along with an unchecked-by-default check box to YES DAMMIT DELETE THE WHOLE THING
 
-#    $page->param(groupname => groupName($dbh,$webvar{id}));
-# print some neato things?
-
-#  } else {
-#    #whether actually deleting or cancelling we redirect to the group list, default format
-
   } elsif ($webvar{del} eq 'ok') {
     my $deleteme = groupName($dbh,$webvar{id}); # get this before we delete it...
     my $delparent = parentID($webvar{id}, 'group','group');
     my ($code,$msg) = delGroup($dbh, $webvar{id});
-    if ($code ne 'OK') {
-# need to find failure mode
-      logaction(0, $session->param("username"), $delparent, "Failure deleting group $deleteme: $msg");
-      changepage(page => "grpman", errmsg => "Error deleting group $deleteme: $msg");
-    } else {
+    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");
+    } else {
+# need to find failure mode
+      logaction(0, $session->param("username"), $delparent, "Failed to delete group $deleteme: $msg");
+      changepage(page => "grpman", errmsg => "Error deleting group $deleteme: $msg");
     }
   } else {
@@ -905,5 +898,7 @@
 		"Updated default permissions in group ".groupName($dbh, $webvar{gid}));
       }
-    }
+    } # fallthrough else
+    logaction(0, $session->param("username"), $webvar{gid}, "Failed to update default permissions in group ".
+	groupName($dbh, $webvar{gid}).": $msg");
     # no point in doing extra work
     fill_permissions($page, \%chperms);
@@ -994,5 +989,5 @@
       } else {
         logaction($webvar{$_}, $session->param("username"), parentID($webvar{$_}, 'dom', 'group'),
-		"Failure moving domain ".domainName($dbh, $webvar{$_})." to group $newgname: $msg");
+		"Failed to move domain ".domainName($dbh, $webvar{$_})." to group $newgname: $msg");
       }
       $row{domerr} = $msg;
@@ -1051,5 +1046,5 @@
         $row{domok} = ($code eq 'OK');
       } else {
-        logaction($webvar{$_}, $session->param("username"), $pargroup, "Failure deleting domain $dom: $msg");
+        logaction($webvar{$_}, $session->param("username"), $pargroup, "Failed to delete domain $dom: $msg");
       }
       $row{domerr} = $msg;
@@ -1200,7 +1195,7 @@
 	  $newperms{admin} = 1 if $webvar{accttype} eq 'S';
 	  ($code,$msg) = changePermissions($dbh, 'user', $webvar{uid}, \%newperms, ($permstring eq 'i'));
+	  logaction(0, $session->param("username"), $curgroup,
+		"Updated uid $webvar{uid}, user $webvar{uname} ($webvar{fname} $webvar{lname})");
 	}
-	logaction(0, $session->param("username"), $curgroup,
-		"Updated uid $webvar{uid}, user $webvar{uname} ($webvar{fname} $webvar{lname})");
       }
     }
@@ -1238,5 +1233,6 @@
       fill_actypelist($webvar{accttype});
       fill_clonemelist();
-##fixme: log
+      logaction(0, $session->param("username"), $curgroup, "Failed to $webvar{action} user ".
+	"$webvar{uname}: $msg");
     }
 
@@ -1304,11 +1300,5 @@
     my $userref = getUserData($dbh, $webvar{id});
     my ($code,$msg) = delUser($dbh, $webvar{id});
-    if ($code ne 'OK') {
-# need to find failure mode
-      $page->param(del_failed => 1);
-      $page->param(errmsg => $msg);
-      list_users($curgroup);
-#Error deleting user <TMPL_VAR NAME=delusername>: <TMPL_VAR NAME=errmsg>
-    } else {
+    if ($code eq 'OK') {
       # success.  go back to the user list, do not pass "GO"
       # actions on users have a domain id of 0, always
@@ -1317,4 +1307,11 @@
       changepage(page => "useradmin", resultmsg => "Deleted user ".$userref->{username}.
 	" (".$userref->{lastname}.", ".$userref->{firstname}.")");
+    } else {
+# need to find failure mode
+      $page->param(del_failed => 1);
+      $page->param(errmsg => $msg);
+      list_users($curgroup);
+      logaction(0, $session->param("username"), $curgroup, "Failed to delete user ".
+	"$webvar{id}/".$userref->{username}.": $msg");
     }
   } else {