Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed problem with 'self register = 3'

Browse Source 
SVN revision: 236
This commit is contained in:
Stefan Ritt 2002-09-12 10:08:25 +00:00
parent eb1636b2a3
commit 73ad49fa12
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 2.74 2002/09/12 10:08:25 midas
Fixed problem with 'self register = 3'
Revision 2.73 2002/09/12 08:48:54 midas Revision 2.73 2002/09/12 08:48:54 midas
Fixed sorting bug Fixed sorting bug
@ -5031,7 +5034,7 @@ int i, fh, size, self_register;
} }
/* if requested, send notification email to admin user */ /* if requested, send notification email to admin user */
if (new_user && (self_register == 2 || self_register == 3)) if (new_user && (self_register == 2 || self_register == 3) && !isparam("admin"))
{ {
if (!getcfg("global", "SMTP host", smtp_host)) if (!getcfg("global", "SMTP host", smtp_host))
{ {
@ -5272,6 +5275,7 @@ int i;
rsprintf("<input type=submit name=cmd value=\"%s\">\n", loc("Save")); rsprintf("<input type=submit name=cmd value=\"%s\">\n", loc("Save"));
rsprintf("<input type=submit name=cmd value=\"%s\">\n", loc("Cancel")); rsprintf("<input type=submit name=cmd value=\"%s\">\n", loc("Cancel"));
rsprintf("<input type=hidden name=config value=\"%s\">\n", user); rsprintf("<input type=hidden name=config value=\"%s\">\n", user);
rsprintf("</td></tr></table></td></tr>\n\n"); rsprintf("</td></tr></table></td></tr>\n\n");
/* overall table for message giving blue frame */ /* overall table for message giving blue frame */
@ -5283,6 +5287,7 @@ int i;
if (getcfg(lbs->name, "Admin user", str) && if (getcfg(lbs->name, "Admin user", str) &&
strstr(str, getparam("unm")) != 0) strstr(str, getparam("unm")) != 0)
{ {
rsprintf("<input type=hidden name=admin value=1>\n");
rsprintf("<tr><td width=10%% bgcolor=%s>%s:</td>\n", gt("Categories bgcolor1"), loc("Select user")); rsprintf("<tr><td width=10%% bgcolor=%s>%s:</td>\n", gt("Categories bgcolor1"), loc("Select user"));
rsprintf("<td bgcolor=%s><select name=cfg_user onChange=\"document.form1.submit()\">\n", gt("Categories bgcolor2")); rsprintf("<td bgcolor=%s><select name=cfg_user onChange=\"document.form1.submit()\">\n", gt("Categories bgcolor2"));
@ -7764,23 +7769,6 @@ BOOL first;
strcpy(command, getparam("cmd")); strcpy(command, getparam("cmd"));
/* display account request notification */
if (equal_ustring(command, "Requested"))
{
show_standard_header(loc("ELOG registration"), "");
rsprintf("<p><p><p><table border=%s width=50%% bgcolor=%s cellpadding=1 cellspacing=0 align=center>",
gt("Border width"), gt("Frame color"));
rsprintf("<tr><td><table cellpadding=5 cellspacing=0 border=0 width=100%% bgcolor=%s>\n", gt("Frame color"));
rsprintf("<tr><td bgcolor=#B0FFB0 align=center>");
rsprintf(loc("Your request has been forward the the administrator. You will be notified by email upon activation of your new account."));
rsprintf("</td></tr>\n</table></td></tr></table>\n");
rsprintf("</body></html>\n");
return;
}
/* correct for image buttons */ /* correct for image buttons */
if (*getparam("cmd_first.x")) if (*getparam("cmd_first.x"))
strcpy(command, loc("First")); strcpy(command, loc("First"));
@ -9437,6 +9425,25 @@ LOGBOOK *cur_lb;
redirect(str); redirect(str);
return; return;
} }
if (equal_ustring(command, "Requested"))
{
/* display account request notification */
if (equal_ustring(command, "Requested"))
{
show_standard_header(loc("ELOG registration"), "");
rsprintf("<p><p><p><table border=%s width=50%% bgcolor=%s cellpadding=1 cellspacing=0 align=center>",
gt("Border width"), gt("Frame color"));
rsprintf("<tr><td><table cellpadding=5 cellspacing=0 border=0 width=100%% bgcolor=%s>\n", gt("Frame color"));
rsprintf("<tr><td bgcolor=#B0FFB0 align=center>");
rsprintf(loc("Your request has been forward the the administrator. You will be notified by email upon activation of your new account."));
rsprintf("</td></tr>\n</table></td></tr></table>\n");
rsprintf("</body></html>\n");
return;
}
}
} }
logf("Connection of user \"%s\"",getparam("unm")); logf("Connection of user \"%s\"",getparam("unm"));