Changeset 297 for trunk/dns.cgi

Timestamp:

04/02/12 17:26:53 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Move action logging for user delete into delUser(). See #35
Tweak log entry/result message for userStatus() for consistency
and clarity

File:

• trunk/dns.cgi (modified) (1 diff)

trunk/dns.cgi

@@ -1383 +1383 @@
     $page->param(user => userFullName($dbh,$webvar{id}));
   } elsif ($webvar{del} eq 'ok') {
-##fixme: find group id user is in (for logging) *before* we delete the user
-##fixme: get other user data too for log
-    my $userref = getUserData($dbh, $webvar{id});
     my ($code,$msg) = delUser($dbh, $webvar{id});
     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
-      logaction(0, $session->param("username"), $curgroup, "Deleted user $webvar{id}/".$userref->{username}.
-        " (".$userref->{lastname}.", ".$userref->{firstname}.")");
-      changepage(page => "useradmin", resultmsg => "Deleted user ".$userref->{username}.
-        " (".$userref->{lastname}.", ".$userref->{firstname}.")");
+      changepage(page => "useradmin", resultmsg => $msg);
     } 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")
-        if $config{log_failures};
+      changepage(page => "useradmin", errmsg => $msg);
     }
   } else {