mirror of
https://github.com/fusionpbx/fusionpbx.git
synced 2025-12-30 00:53:50 +00:00
Update index.php
Minor changes. Use the provision array to get the cidr details.
This commit is contained in:
@@ -213,13 +213,13 @@
|
||||
http_error('404');
|
||||
}
|
||||
|
||||
//keep backwards compatibility
|
||||
$provision_cidrs = $settings->get('provision','cidr', []);
|
||||
//get all provision settings
|
||||
$provision = $settings->get('provision', null, []);
|
||||
|
||||
//check the cidr range
|
||||
if (!empty($provision_cidrs)) {
|
||||
if (!empty($provision['cidr'])) {
|
||||
$found = false;
|
||||
foreach($provision_cidrs as $cidr) {
|
||||
foreach($provision['cidr'] as $cidr) {
|
||||
if (check_cidr($cidr, $_SERVER['REMOTE_ADDR'])) {
|
||||
$found = true;
|
||||
break;
|
||||
@@ -231,10 +231,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
//get all provision settings
|
||||
$provision = $settings->get('provision', null, []);
|
||||
$auth_passwords = $settings->get('provision', 'http_auth_password', []);
|
||||
|
||||
//http authentication - digest
|
||||
if (!empty($provision["http_auth_username"]) && empty($provision["http_auth_type"])) { $provision["http_auth_type"] = "digest"; }
|
||||
if (!empty($provision["http_auth_username"]) && $provision["http_auth_type"] === "digest" && !empty($provision["http_auth_enabled"]) && $provision["http_auth_enabled"] === "true") {
|
||||
@@ -321,6 +317,7 @@
|
||||
}
|
||||
else {
|
||||
$authorized = false;
|
||||
$auth_passwords = $settings->get('provision', 'http_auth_password', []);
|
||||
foreach ($auth_passwords as $password) {
|
||||
if ($_SERVER['PHP_AUTH_PW'] == $password) {
|
||||
$authorized = true;
|
||||
@@ -343,7 +340,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
//if password was defined in the Default Settings page then require the password.
|
||||
//if the password was defined in the settings then require the password.
|
||||
if (!empty($provision['password'])) {
|
||||
//deny access if the password doesn't match
|
||||
if ($provision['password'] != check_str($_REQUEST['password'])) {
|
||||
|
||||
Reference in New Issue
Block a user