mirror/moodle-auth_outage
1
0
Fork 0
mirror of https://github.com/catalyst/moodle-auth_outage.git synced 2026-05-17 05:48:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Issue #288: Split allowed IPs settings into two.

Browse Source 
Merge two settings when accessing config.
Bump version.
This commit is contained in:
Jason den Dulk
2022-04-28 09:47:58 +10:00
parent afc96d347d
commit c64a33c345
5 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
classes/local/outagelib.php
View File

@@ -168,7 +168,12 @@ class outagelib {
}
}
return (object)array_merge(self::get_config_defaults(), $config);
$config = array_merge(self::get_config_defaults(), $config);
// Combine allowed IPs config values together.
if (isset($config['allowedips_forced'])) {
$config['allowedips'] = trim($config['allowedips'] . "\n" . $config['allowedips_forced']);
}
return (object)$config;
}
/**