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 crashes with user registration and password file in [global] section

Browse Source 
SVN revision: 501
This commit is contained in:
Stefan Ritt 2003-04-22 07:50:05 +00:00
parent 2f430506c1
commit a05c9339bb
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/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 1.87 2003/04/22 07:50:05 midas
Fixed crashes with user registration and password file in [global] section
Revision 1.86 2003/04/22 07:02:12 midas Revision 1.86 2003/04/22 07:02:12 midas
Added javascript code to put focus on name field on login page Added javascript code to put focus on name field on login page
@ -6208,8 +6211,11 @@ int i, fh, size, self_register;
{ {
if (url[strlen(url)-1] != '/') if (url[strlen(url)-1] != '/')
strlcat(url, "/", sizeof(url)); strlcat(url, "/", sizeof(url));
strlcat(url, lbs->name, sizeof(url)); if (lbs)
strlcat(url, "/", sizeof(url)); {
strlcat(url, lbs->name, sizeof(url));
strlcat(url, "/", sizeof(url));
}
} }
if (!getcfg(lbs->name, "Use Email from", mail_from)) if (!getcfg(lbs->name, "Use Email from", mail_from))
@ -6581,8 +6587,11 @@ char str[1000], login_name[256], full_name[256], user_email[256], name[256], pwd
{ {
if (url[strlen(url)-1] != '/') if (url[strlen(url)-1] != '/')
strlcat(url, "/", sizeof(url)); strlcat(url, "/", sizeof(url));
strlcat(url, lbs->name, sizeof(url)); if (lbs)
strlcat(url, "/", sizeof(url)); {
strlcat(url, lbs->name, sizeof(url));
strlcat(url, "/", sizeof(url));
}
} }
sprintf(redir, "?cmd=%s&old_pwd=%s", loc("Change password"), pwd); sprintf(redir, "?cmd=%s&old_pwd=%s", loc("Change password"), pwd);
@ -11229,7 +11238,7 @@ FILE *f;
/* check for password recovery */ /* check for password recovery */
if (isparam("cmd") || isparam("newpwd")) if (isparam("cmd") || isparam("newpwd"))
{ {
if (equal_ustring(getparam("cmd"), "Change password") || isparam("newpwd")) if (equal_ustring(getparam("cmd"), loc("Change password")) || isparam("newpwd"))
{ {
show_change_pwd_page(NULL); show_change_pwd_page(NULL);
return; return;