composer format; fix syntax issue; comment out code in model/Login which fails psalm check

This commit is contained in:
David Goodwin committed 2021-01-14 22:22:27 +00:00
1 parent cb161a7cec
commit 70bf59edc4
3 files changed
+6 -4

No files matched your search

+2 -1
View File
@@ -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;
}
}
+2 -1
View File
@@ -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');
}
+2 -2
View File
@@ -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');
}