Changeset 188

Timestamp:

12/06/11 16:40:04 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

UI tweaks and fixes for user and domain status changes:

• Log all changes
• Display "ok, did something" message
• Check correct permission on domain status change
• Check for permissions on user status change
• Clean up URL that's handed around to put into template slots

File:

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

trunk/dns.cgi

@@ -289 +289 @@
       $flag = 1 if isParent($dbh, $_, 'group', $webvar{id}, 'domain');
     }
-    if ($flag && ($permissions{admin} || $permissions{edit_domain})) {
+    if ($flag && ($permissions{admin} || $permissions{domain_edit})) {
       my $stat = domStatus($dbh,$webvar{id},$webvar{domstatus});
+##fixme  switch to more consise "Enabled <domain"/"Disabled <domain>" as with users?
       logaction($webvar{id}, $session->param("username"), parentID($webvar{id}, 'dom', 'group'),
         "Changed ".domainName($dbh, $webvar{id})." state to ".($stat ? 'active' : 'inactive'));
+      $page->param(resultmsg => "Changed ".domainName($dbh, $webvar{id})." state to ".
+        ($stat ? 'active' : 'inactive'));
     } else {
       $page->param(errmsg => "You are not permitted to view or change the requested domain");
     }
+    $uri_self =~ s/\&amp;domstatus=[^&]*//g;    # clean up URL for stuffing into templates
   }
 
@@ -1069 +1073 @@
       $flag = 1 if isParent($dbh, $_, 'group', $webvar{id}, 'user');
     }
-    if ($flag) {
-      userStatus($dbh,$webvar{id},$webvar{userstatus});
+    if ($flag && ($permissions{admin} || $permissions{user_edit})) {
+      my $stat = userStatus($dbh,$webvar{id},$webvar{userstatus});
+      logaction(0, $session->param("username"), parentID($webvar{id}, 'user', 'group'),
+        ($stat ? 'Enabled' : 'Disabled')." ".userFullName($dbh, $webvar{id}, '%u'));
+      $page->param(resultmsg => ($stat ? 'Enabled' : 'Disabled')." ".userFullName($dbh, $webvar{id}, '%u'));
     } else {
       $page->param(errmsg => "You are not permitted to view or change the requested user");
     }
+    $uri_self =~ s/\&amp;userstatus=[^&]*//g;   # clean up URL for stuffing into templates
   }