Changeset 142 for trunk

Timestamp:

10/13/11 17:52:48 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Working on user-permission ACLs. Links now show or not as appropriate

Location:

trunk

Files:

• dns.cgi (modified) (3 diffs)
• templates/useradmin.tmpl (modified) (3 diffs)

trunk/dns.cgi

@@ -823 +823 @@
   }
 
+  list_users();
+
+# Permissions!
+  $page->param(adduser => $permissions{admin} || $permissions{user_create});
+# should we block viewing other users?  Vega blocks "editing"...
+#  NB:  no "edit self" link as with groups here.  maybe there should be?
+#  $page->param(eduser => $permissions{admin} || $permissions{user_edit});
+  $page->param(deluser => $permissions{admin} || $permissions{user_delete});
+
+  $page->param(errmsg => $webvar{errmsg}) if $webvar{errmsg};
   $page->param(curpage => $webvar{page});
-
-  list_users();
 
 } elsif ($webvar{page} eq 'user') {
@@ -1070 +1078 @@
       $page->param(errmsg => $msg);
       list_users($curgroup);
+#Error deleting user <TMPL_VAR NAME=delusername>: <TMPL_VAR NAME=errmsg>
     } else {
       # success.  go back to the user list, do not pass "GO"
@@ -1840 +1849 @@
     $row{bg} = ($rownum++)%2;
     $row{sid} = $sid;
+    $row{eduser} = ($permissions{admin} || $permissions{user_edit});
+    $row{deluser} = ($permissions{admin} || $permissions{user_delete});
     push @userlist, \%row;
   }

trunk/templates/useradmin.tmpl

@@ -8 +8 @@
 <div class="warning">Warning: <TMPL_VAR NAME=warnmsg></div>
 </TMPL_IF>
-<TMPL_IF del_failed>
-<div class='errmsg'>Error deleting user <TMPL_VAR NAME=delusername>: <TMPL_VAR NAME=errmsg></div>
+<TMPL_IF errmsg>
+<div class='errmsg'><TMPL_VAR NAME=errmsg></div>
 </TMPL_IF>
 
@@ -20 +20 @@
 </tr>
 <tr><td colspan="3" align="center"><TMPL_INCLUDE NAME="lettsearch.tmpl"></td></tr>
+<TMPL_IF adduser>
 <tr><td colspan="3" align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=user">New User</a></td></tr>
+</TMPL_IF>
 </table>
 
@@ -27 +29 @@
 <TMPL_LOOP NAME=colheads>
         <td class="datahead_<TMPL_IF firstcol>l<TMPL_ELSE>s</TMPL_IF>"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=page><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;sortby=<TMPL_VAR NAME=sortby>&amp;order=<TMPL_VAR NAME=order>"><TMPL_VAR NAME=colname></a><TMPL_IF NAME=sortorder>&nbsp;<img alt="<TMPL_VAR NAME=sortorder>" src="images/<TMPL_VAR NAME=sortorder>.png" /></TMPL_IF></td></TMPL_LOOP>
-        <td class="datahead_s">Delete</td>
+<TMPL_IF deluser>       <td class="datahead_s">Delete</td></TMPL_IF>
 </tr>
 <TMPL_IF name=usertable>
 <TMPL_LOOP name=usertable>
 <tr class="row<TMPL_VAR name=bg>">
-        <td align="left"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=user&amp;action=edit&amp;user=<TMPL_VAR NAME=userid>"><TMPL_VAR NAME=username></a></td>
+        <td align="left"><TMPL_IF eduser><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=user&amp;action=edit&amp;user=<TMPL_VAR NAME=userid>"><TMPL_VAR NAME=username></a><TMPL_ELSE><TMPL_VAR NAME=username></TMPL_IF></td>
         <td class="data_nowrap"><TMPL_VAR name=userfull></td>
         <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;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">
+<TMPL_IF eduser>
+                <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 active>useroff<TMPL_ELSE>useron</TMPL_IF>"><TMPL_IF active>enabled<TMPL_ELSE>disabled</TMPL_IF></a>
+<TMPL_ELSE>
+                <TMPL_IF active>enabled<TMPL_ELSE>disabled</TMPL_IF>
+</TMPL_IF>
+</td>
+<TMPL_IF deluser>
         <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>
+</TMPL_IF>
 </tr>
 </TMPL_LOOP>