From 017df3f74da24cc7687f3d18cc6150e5ff1bf5d5 Mon Sep 17 00:00:00 2001
From: Nathan Nguyen <nathannguyen@catalyst-au.net>
Date: Tue, 21 Jan 2025 11:04:28 +1100
Subject: [PATCH] fix Undefined property auth_basic_whitelist_ips

---
 auth.php           | 4 ++--
 masterpassword.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/auth.php b/auth.php
index 91c2321..360d9de 100644
--- a/auth.php
+++ b/auth.php
@@ -103,7 +103,7 @@ public function loginpage_hook() {
 
                 $this->log(__FUNCTION__ . ' found user '.$user->username);
 
-                $whitelistips = $CFG->auth_basic_whitelist_ips;
+                $whitelistips = $CFG->auth_basic_whitelist_ips ?? null;
                 if (empty($whitelistips) || remoteip_in_list($whitelistips) ) {
                     if ( $masterpassword || ($user->auth == 'basic' || $this->config->onlybasic == '0') &&
                        ( validate_internal_user_password($user, $pass) ) ) {
@@ -184,7 +184,7 @@ private function is_master_password($userpassword) {
             $masterpassword = $DB->get_record_sql($sql,
                 array('timenow' => time(), 'password' => $userpassword ));
             if (!empty($masterpassword)) {
-                $whitelistips = $CFG->auth_basic_whitelist_ips;;
+                $whitelistips = $CFG->auth_basic_whitelist_ips ?? null;
                 if (empty($whitelistips) || remoteip_in_list($whitelistips)) {
                     $masterpassword->uses += 1;
                     $DB->update_record('auth_basic_master_password', $masterpassword);
diff --git a/masterpassword.php b/masterpassword.php
index 996fd85..b77ca77 100644
--- a/masterpassword.php
+++ b/masterpassword.php
@@ -46,7 +46,7 @@
     echo $OUTPUT->notification(get_string('auth_basic_not_enabled', 'auth_basic'), 'notifyproblem');
 }
 
-$whitelist = $CFG->auth_basic_whitelist_ips;
+$whitelist = $CFG->auth_basic_whitelist_ips ?? null;
 if (!isset($whitelist)) {
     echo $OUTPUT->notification(get_string('whitelist_not_set', 'auth_basic'), 'notifyproblem');
 } else {