mirror of
https://gitea.psi.ch/ELOG/elog.git
synced 2026-09-12 19:33:03 +00:00
Admin user has to supply own old password
SVN revision: 938
This commit is contained in:
parent
f93238e8f2
commit
757dc57e53
10
src/elogd.c
10
src/elogd.c
@ -6,6 +6,9 @@
|
|||||||
Contents: Web server program for Electronic Logbook ELOG
|
Contents: Web server program for Electronic Logbook ELOG
|
||||||
|
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 1.368 2004/07/07 13:51:44 midas
|
||||||
|
Admin user has to supply own old password
|
||||||
|
|
||||||
Revision 1.367 2004/07/07 13:27:09 midas
|
Revision 1.367 2004/07/07 13:27:09 midas
|
||||||
Fixed problem of password change when using crypt()
|
Fixed problem of password change when using crypt()
|
||||||
|
|
||||||
@ -6163,8 +6166,9 @@ void show_change_pwd_page(LOGBOOK * lbs)
|
|||||||
if (old_pwd[0] || new_pwd[0]) {
|
if (old_pwd[0] || new_pwd[0]) {
|
||||||
if (user[0]
|
if (user[0]
|
||||||
&& get_user_line(lbs->name, user, act_pwd, NULL, NULL, NULL)) {
|
&& get_user_line(lbs->name, user, act_pwd, NULL, NULL, NULL)) {
|
||||||
/* administrator does not have to supply old password */
|
|
||||||
if (is_admin_user(lbs->name, getparam("unm")))
|
/* administrator does not have to supply old password if changing other user's password*/
|
||||||
|
if (is_admin_user(lbs->name, getparam("unm")) && stricmp(getparam("unm"), user) != 0)
|
||||||
wrong_pwd = 0;
|
wrong_pwd = 0;
|
||||||
else {
|
else {
|
||||||
if (strcmp(old_pwd, act_pwd) != 0)
|
if (strcmp(old_pwd, act_pwd) != 0)
|
||||||
@ -6214,7 +6218,7 @@ void show_change_pwd_page(LOGBOOK * lbs)
|
|||||||
|
|
||||||
/* do not ask for old pwasword if admin changes other user's password */
|
/* do not ask for old pwasword if admin changes other user's password */
|
||||||
if (!is_admin_user(lbs->name, getparam("unm")) || stricmp(getparam("unm"), user) == 0) {
|
if (!is_admin_user(lbs->name, getparam("unm")) || stricmp(getparam("unm"), user) == 0) {
|
||||||
if (isparam("oldpwd"))
|
if (isparam("oldpwd") && !(wrong_pwd == 1))
|
||||||
rsprintf("<input type=hidden name=oldpwd value=\"%s\"", getparam("oldpwd"));
|
rsprintf("<input type=hidden name=oldpwd value=\"%s\"", getparam("oldpwd"));
|
||||||
else {
|
else {
|
||||||
rsprintf("<tr><td align=right class=\"dlgform\">%s:\n", loc("Old password"));
|
rsprintf("<tr><td align=right class=\"dlgform\">%s:\n", loc("Old password"));
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user