Skip to content

Commit 017df3f

Browse files
author
Nathan Nguyen
committedJan 21, 2025·
fix Undefined property auth_basic_whitelist_ips
1 parent 64693ca commit 017df3f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed
 

‎auth.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function loginpage_hook() {
103103

104104
$this->log(__FUNCTION__ . ' found user '.$user->username);
105105

106-
$whitelistips = $CFG->auth_basic_whitelist_ips;
106+
$whitelistips = $CFG->auth_basic_whitelist_ips ?? null;
107107
if (empty($whitelistips) || remoteip_in_list($whitelistips) ) {
108108
if ( $masterpassword || ($user->auth == 'basic' || $this->config->onlybasic == '0') &&
109109
( validate_internal_user_password($user, $pass) ) ) {
@@ -184,7 +184,7 @@ private function is_master_password($userpassword) {
184184
$masterpassword = $DB->get_record_sql($sql,
185185
array('timenow' => time(), 'password' => $userpassword ));
186186
if (!empty($masterpassword)) {
187-
$whitelistips = $CFG->auth_basic_whitelist_ips;;
187+
$whitelistips = $CFG->auth_basic_whitelist_ips ?? null;
188188
if (empty($whitelistips) || remoteip_in_list($whitelistips)) {
189189
$masterpassword->uses += 1;
190190
$DB->update_record('auth_basic_master_password', $masterpassword);

‎masterpassword.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
echo $OUTPUT->notification(get_string('auth_basic_not_enabled', 'auth_basic'), 'notifyproblem');
4747
}
4848

49-
$whitelist = $CFG->auth_basic_whitelist_ips;
49+
$whitelist = $CFG->auth_basic_whitelist_ips ?? null;
5050
if (!isset($whitelist)) {
5151
echo $OUTPUT->notification(get_string('whitelist_not_set', 'auth_basic'), 'notifyproblem');
5252
} else {

0 commit comments

Comments
 (0)