diff --git a/model/Login.php b/model/Login.php index ee5eeac4..6249e3d4 100644 --- a/model/Login.php +++ b/model/Login.php @@ -122,6 +122,7 @@ class Login { return true; } # nothing to do +/* what's going on here ? $cmdarg1=escapeshellarg($this->id); $cmdarg2=escapeshellarg($domain); $cmdarg3=escapeshellarg($old_password); @@ -136,7 +137,7 @@ class Login { $this->errormsg[] = $warnmsg_pw; return false; } - + */ return true; } } diff --git a/public/users/password-change.php b/public/users/password-change.php index 46aba78d..1eb33c87 100644 --- a/public/users/password-change.php +++ b/public/users/password-change.php @@ -40,7 +40,8 @@ $CONF = Config::getInstance()->getAll(); $smarty->configureTheme($rel_path); -if ($context === 'admin' && !Config::read('forgotten_admin_password_reset') || $context === 'users' && (!Config::read('forgotten_user_password_reset') || Config::read('mailbox_postpassword_script')) { +if ($context === 'admin' && !Config::read('forgotten_admin_password_reset') || + $context === 'users' && (!Config::read('forgotten_user_password_reset') || Config::read('mailbox_postpassword_script'))) { die('Password reset is disabled by configuration option: forgotten_admin_password_reset or mailbox_postpassword_script'); } diff --git a/public/users/password-recover.php b/public/users/password-recover.php index 04bc73aa..8aaf6d97 100644 --- a/public/users/password-recover.php +++ b/public/users/password-recover.php @@ -38,8 +38,8 @@ if (preg_match('/\/users\//', $_SERVER['REQUEST_URI'])) { require_once($rel_path . 'common.php'); - -if ($context === 'admin' && !Config::read('forgotten_admin_password_reset') || $context === 'users' && (!Config::read('forgotten_user_password_reset') || Config::read('mailbox_postpassword_script'))) { +if ($context === 'admin' && !Config::read('forgotten_admin_password_reset') || + $context === 'users' && (!Config::read('forgotten_user_password_reset') || Config::read('mailbox_postpassword_script'))) { die('Password reset is disabled by configuration option: forgotten_admin_password_reset or mailbox_postpassword_script'); }