From 66c472d346be51a7f1f8edff41bec86d49217b42 Mon Sep 17 00:00:00 2001
From: David Goodwin <david@codepoets.co.uk>
Date: Sat, 18 Jun 2022 11:14:28 +0100
Subject: [PATCH] remove unnecessary prefix on callable / rename.

---
 config.inc.php   | 6 +++---
 public/login.php | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

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');