diff --git a/config.inc.php b/config.inc.php index 146bbb69..c6d8cc75 100644 --- a/config.inc.php +++ b/config.inc.php @@ -735,11 +735,11 @@ $CONF['password_expiration'] = 'YES'; * If they return null, then it's assumed authentication failed. * IF they authentication succeeds they should return the id of a user in the postfixadmin database. */ -$CONF['postfixadmin_auth_admin_callback'] = null; -$CONF['postfixadmin_auth_user_callback'] = null; +$CONF['auth_admin_callback'] = null; +$CONF['auth_user_callback'] = null; /* -$CONF['postfixadmin_auth_admin_callback'] = function () { +$CONF['auth_admin_callback'] = function () { if (!isset($_SERVER['REMOTE_USER'])) { return null; } diff --git a/public/login.php b/public/login.php index 929c804b..ca4ec06f 100644 --- a/public/login.php +++ b/public/login.php @@ -63,8 +63,10 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $config = Config::getInstance()->getAll(); $authenticated = false; - if (is_callable($config['postfixadmin_auth_admin_callback'])) { - $fUsername = $config['postfixadmin_auth_admin_callback'](); + $callable = $config['auth_admin_callback'] ?? null; + + if (is_callable($callable)) { + $fUsername = $callable(); $authenticated = is_string($fUsername); } else { $login = new Login('admin');