Changeset 286 for branches/stable/cgi-bin/admin.cgi

Timestamp:

09/23/05 15:54:31 (19 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge changes from /trunk revisions:

234
237
254 (ipdb.css only)
261
279
284
285

This merges the new search system (234, 237, 254), cleans up
some display CSS (254, 279), cleans up some leftover code (r261),
and merges the "private data" code (284, 285 - note SWIP hacks conflict).

/trunk should now be almost identical to /branches/stable.

File:

• branches/stable/cgi-bin/admin.cgi (modified) (3 diffs)

branches/stable/cgi-bin/admin.cgi

@@ -301 +301 @@
 
   print "<hr>Users with access:\n<table border=1>\n";
+  print "<tr><td></td><td align=center colspan=3>General access</td></tr>\n";
   print "<tr><td>Username</td><td>Add new</td><td>Change</td>".
-        "<td>Delete</td><td>Admin user</td></tr>\n".
+        "<td>Delete</td><td>Systems/Networking</td><td>Admin user</td></tr>\n".
         "<form action=admin.cgi method=POST>\n";
   $sth = $ip_dbh->prepare("select username,acl from users order by username");
@@ -314 +315 @@
         "></td><td><input type=checkbox name=change".($data[1] =~ /c/ ? ' checked=y' : '').
         "></td><td><input type=checkbox name=del".($data[1] =~ /d/ ? ' checked=y' : '').
+        "></td><td><input type=checkbox name=sysnet".($data[1] =~ /s/ ? ' checked=y' : '').
         "></td><td><input type=checkbox name=admin".($data[1] =~ /A/ ? ' checked=y' : '').
         qq(></td><td><input type=submit value="Update"></td></form>\n).
@@ -326 +328 @@
   my $acl = 'b';
   if ($webvar{admin} eq 'on') {
-    $acl .= "acdA";
+    $acl .= "acdsA";
   } else {
     $acl .= ($webvar{add} eq 'on' ? 'a' : '').
         ($webvar{change} eq 'on' ? 'c' : '').
-        ($webvar{del} eq 'on' ? 'd' : '');
+        ($webvar{del} eq 'on' ? 'd' : '').
+        ($webvar{sysnet} eq 'on' ? 's' : '');
   }
   print "New ACL: $acl<br>\n";