Removed 'admin' command, added link 'change elogd.cfg' on config page instead

SVN revision: 472
This commit is contained in:
2003-04-04 11:00:22 +00:00
parent 370f0a7734
commit fccf1c6815
4 changed files with 19 additions and 14 deletions
+2
View File
@@ -2,6 +2,8 @@ Version 2.3.5, released April xxx, 2003
=======================================
- Added option "Summary page title"
- Translate "Date" correctly
- Changed "#" to "ID"
Version 2.3.4, released April 2nd, 2003
=======================================
+3 -3
View File
@@ -889,9 +889,9 @@ expiration</b></code > option, giving the expiration time in hours. Setting this
for example, makes the password expire after one day.<p>
The <b><code>Admin user = &lt;user list&gt;</b></code> is a list of one or more user names,
which have admin rights. The can execute the <b><code>Admin</code></b> command to directly
edit elogd.cfg through the web and modify other users via the <b><code>Config</code></b>
command.<p>
which have admin rights. They see a button <b><code>Change elogd.cfg</code></b> on the
config page by which they can edit elogd.cfg through the web. They can also modify other
users on the <b><code>Config</code></b> page, change their passwords or remove them.<p>
The <b><code>Login user = &lt;user list&gt;</b></code> is a list of users who can
log in to a specific logbook. This option can be used with a global password file. If a
+1
View File
@@ -246,4 +246,5 @@ User <i>"%s"</i> has no access to logbook <i>"%s"</i> = Benutzer <i>"%s"</i> hat
# New strings for V2.3.5
Date = Datum
ID = ID
Change elogd.cfg = elogd.cfg ändern
+13 -11
View File
@@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG
$Log$
Revision 1.66 2003/04/04 11:00:22 midas
Removed 'admin' command, added link 'change elogd.cfg' on config page instead
Revision 1.65 2003/04/04 10:24:27 midas
Translate 'Date' and changed '#' to 'ID'
@@ -6382,10 +6385,11 @@ int i;
rsprintf("<input type=submit name=cmd value=\"%s\">\n", loc("Change password"));
rsprintf("<input type=submit name=cmd value=\"%s\">\n", loc("Remove user"));
if (getcfg(lbs->name, "Admin user", str) &&
strstr(str, getparam("unm")) != 0)
if (!getcfg(lbs->name, "Admin user", str) ||
(getcfg(lbs->name, "Admin user", str) && strstr(str, getparam("unm")) != 0))
{
rsprintf("<input type=submit name=cmd value=\"%s\">\n", loc("New user"));
rsprintf("<input type=submit name=cmd value=\"%s\">\n", loc("Change elogd.cfg"));
}
/* hidden field for password */
@@ -7388,10 +7392,12 @@ int i, n;
if (getcfg(lbs->name, "Password file", str))
{
if (getcfg(lbs->name, "Admin user", str) &&
strstr(str, getparam("unm")) != 0)
if (!getcfg(lbs->name, "Admin user", str) ||
(getcfg(lbs->name, "Admin user", str) && strstr(str, getparam("unm")) != 0))
{
strcat(menu_str, "Admin, ");
strcat(menu_str, loc("Change elogd.cfg"));
strcat(menu_str, ", ");
}
strcat(menu_str, "Config, Logout, ");
}
@@ -8528,7 +8534,7 @@ LOGBOOK *lbs_cur;
strcpy(menu_str, "New, Find, Select, ");
if (getcfg(lbs->name, "Password file", str))
strcat(menu_str, "Admin, Config, Logout, ");
strcat(menu_str, "Config, Logout, ");
else
strcat(menu_str, "Config, ");
@@ -9662,11 +9668,6 @@ BOOL first;
if (getcfg(lbs->name, "Password file", str))
{
if (getcfg(lbs->name, "Admin user", str) &&
strstr(str, getparam("unm")) != 0)
{
strcat(menu_str, "Admin, ");
}
strcat(menu_str, "Config, Logout, ");
}
else
@@ -11392,7 +11393,8 @@ FILE *f;
return;
}
if (equal_ustring(command, loc("Admin")))
if (equal_ustring(command, loc("Admin")) ||
equal_ustring(command, loc("Change elogd.cfg")))
{
show_admin_page(lbs);
return;