* utilize user enum, forward it into the templates as define

diff --git a/webcit/static/t/aide/edituser/detailview.html b/webcit/static/t/aide/edituser/detailview.html
index 35ffbd0ab9d1e42b270a65737f4cb7e9a1e28d32..b210d77157f0a0282eec54015fd96a3ab0007f84 100644 (file)
--- a/webcit/static/t/aide/edituser/detailview.html
+++ b/webcit/static/t/aide/edituser/detailview.html
@@ -19,13 +19,13 @@
 <tr><td><?_("Number of logins")></td><td><input type="text" name="timescalled" value="<?USERLIST:NLOGONS>" maxlength="6"></td></tr>
 <tr><td><?_("Messages submitted")></td><td><input type="text" name="msgsposted" value="<?USERLIST:NPOSTS>" maxlength="6"></td></tr>
 <tr><td><?_("Access level")></td><td><select name="axlevel">
-        <option <?%("COND:USERACCESS", 1, 1, 0, 'selected="selected"', "")> value="0">0 - <?_("Deleted")></option>
-        <option <?%("COND:USERACCESS", 1, 1, 1, 'selected="selected"', "")> value="1">1 - <?_("New User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, 2, 'selected="selected"', "")> value="2">2 - <?_("Problem User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, 3, 'selected="selected"', "")> value="3">3 - <?_("Local User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, 4, 'selected="selected"', "")> value="4">4 - <?_("Network User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, 5, 'selected="selected"', "")> value="5">5 - <?_("Preferred User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, 6, 'selected="selected"', "")> value="6">6 - <?_("Aide")></option>
+        <option <?%("COND:USERACCESS", 1, 1, #"AxDeleted", 'selected="selected"', "")> value="0">0 - <?_("Deleted")></option>
+        <option <?%("COND:USERACCESS", 1, 1, #"AxNewU", 'selected="selected"', "")> value="1">1 - <?_("New User")></option>
+        <option <?%("COND:USERACCESS", 1, 1, #"AxProbU", 'selected="selected"', "")> value="2">2 - <?_("Problem User")></option>
+        <option <?%("COND:USERACCESS", 1, 1, #"AxLocU", 'selected="selected"', "")> value="3">3 - <?_("Local User")></option>
+        <option <?%("COND:USERACCESS", 1, 1, #"AxNetU", 'selected="selected"', "")> value="4">4 - <?_("Network User")></option>
+        <option <?%("COND:USERACCESS", 1, 1, #"AxPrefU", 'selected="selected"', "")> value="5">5 - <?_("Preferred User")></option>
+        <option <?%("COND:USERACCESS", 1, 1, #"AxAideU", 'selected="selected"', "")> value="6">6 - <?_("Aide")></option>
 </select></td></tr>
 <tr><td><?_("User ID number")></td><td><input type="text" name="usernum" value="<?USERLIST:UID>" maxlength="7"></td></tr>
 <tr><td><?_("Date and time of last login")></td><td><select name="lastcall">

diff --git a/webcit/useredit.c b/webcit/useredit.c
index 3194c0159167a937d4f4364ee2381b7f54381709..5eccfdb76ae52e21d16e0647fb71a52f24360676 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -795,4 +795,12 @@ InitModule_USEREDIT
                         GroupchangenPosts,
                         CTX_USERLIST);
 
+       REGISTERTokenParamDefine(AxDeleted);
+       REGISTERTokenParamDefine(AxNewU);
+       REGISTERTokenParamDefine(AxProbU);
+       REGISTERTokenParamDefine(AxLocU);
+       REGISTERTokenParamDefine(AxNetU);
+       REGISTERTokenParamDefine(AxPrefU);
+       REGISTERTokenParamDefine(AxAideU);
 }
+