Skip to content

Commit 5808d29

Browse files
authored
Merge pull request #46 from catalyst/issue#45
fix Undefined property auth_basic_whitelist_ips
2 parents 1146c90 + 017df3f commit 5808d29

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
@@ -108,7 +108,7 @@ public function loginpage_hook() {
108108

109109
$this->log(__FUNCTION__ . ' found user '.$user->username);
110110

111-
$whitelistips = $CFG->auth_basic_whitelist_ips;
111+
$whitelistips = $CFG->auth_basic_whitelist_ips ?? null;
112112
if (empty($whitelistips) || remoteip_in_list($whitelistips) ) {
113113
if ( $masterpassword || ($user->auth == 'basic' || $this->config->onlybasic == '0') &&
114114
( validate_internal_user_password($user, $pass) ) ) {
@@ -188,7 +188,7 @@ private function is_master_password($userpassword) {
188188
$masterpassword = $DB->get_record_sql($sql,
189189
array('timenow' => time(), 'password' => $userpassword ));
190190
if (!empty($masterpassword)) {
191-
$whitelistips = $CFG->auth_basic_whitelist_ips;;
191+
$whitelistips = $CFG->auth_basic_whitelist_ips ?? null;
192192
if (empty($whitelistips) || remoteip_in_list($whitelistips)) {
193193
$masterpassword->uses += 1;
194194
$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)