Changeset 139

Timestamp:

10/07/11 16:01:55 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Reduce the abuse of "actions" as a form input name; make the
domain and user list status changes use their own custom input
names to reduce the mixups when checking "global" actions

Location:

trunk

Files:

• dns.cgi (modified) (2 diffs)
• templates/domlist.tmpl (modified) (1 diff)
• templates/useradmin.tmpl (modified) (1 diff)

trunk/dns.cgi

@@ -228 +228 @@
 # hmm.  seeing problems in some possibly-not-so-corner cases.
 # this currently only handles "domain on", "domain off"
-  if (defined($webvar{action})) {
-    my $stat = domStatus($dbh,$webvar{id},$webvar{action});
+  if (defined($webvar{domstatus})) {
+    my $stat = domStatus($dbh,$webvar{id},$webvar{domstatus});
     logaction($webvar{id}, $session->param("username"), parentID($webvar{id}, 'dom', 'group'),
         "Changed ".domainName($dbh, $webvar{id})." state to ".($stat ? 'active' : 'inactive'));
@@ -797 +797 @@
 } elsif ($webvar{page} eq 'useradmin') {
 
-  if (defined($webvar{action})) {
-    userStatus($dbh,$webvar{id},$webvar{action});
+  if (defined($webvar{userstatus})) {
+    userStatus($dbh,$webvar{id},$webvar{userstatus});
   }
 

trunk/templates/domlist.tmpl

@@ -38 +38 @@
         <td><TMPL_VAR name=status></td>
         <td><TMPL_VAR name=group></td>
-<TMPL_IF domain_edit>   <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=domlist<TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;id=<TMPL_VAR NAME=domainid>&amp;action=<TMPL_IF NAME=mkactive>domon<TMPL_ELSE>domoff</TMPL_IF>"><TMPL_IF NAME=mkactive>activate<TMPL_ELSE>deactivate</TMPL_IF></a></td></TMPL_IF>
+<TMPL_IF domain_edit>   <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=domlist<TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;id=<TMPL_VAR NAME=domainid>&amp;domstatus=<TMPL_IF NAME=mkactive>domon<TMPL_ELSE>domoff</TMPL_IF>"><TMPL_IF NAME=mkactive>activate<TMPL_ELSE>deactivate</TMPL_IF></a></td></TMPL_IF>
 <TMPL_IF domain_delete> <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deldom&amp;id=<TMPL_VAR NAME=domainid>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td></TMPL_IF>
 </tr>

trunk/templates/useradmin.tmpl

@@ -36 +36 @@
         <td><TMPL_VAR name=usertype></td>
         <td><TMPL_VAR name=usergroup></td>
-        <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=useradmin<TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;id=<TMPL_VAR NAME=userid>&amp;action=<TMPL_IF NAME=active>useroff<TMPL_ELSE>useron</TMPL_IF>"><TMPL_IF NAME=active>enabled<TMPL_ELSE>disabled</TMPL_IF></a></td>
+        <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=useradmin<TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;id=<TMPL_VAR NAME=userid>&amp;userstatus=<TMPL_IF NAME=active>useroff<TMPL_ELSE>useron</TMPL_IF>"><TMPL_IF NAME=active>enabled<TMPL_ELSE>disabled</TMPL_IF></a></td>
         <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deluser&amp;id=<TMPL_VAR NAME=userid>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td>
 </tr>