Fix for getNetConfig() resolving local server

This commit is contained in:
billz 2023-02-05 13:52:42 +01:00
parent 5a3e464c23
commit 3e1fbdf298
2 changed files with 4 additions and 5 deletions

View File

@ -133,8 +133,6 @@ function validateDHCPInput()
} }
if (!filter_var($_POST['DefaultGateway'], FILTER_VALIDATE_IP) && !empty($_POST['DefaultGateway'])) { if (!filter_var($_POST['DefaultGateway'], FILTER_VALIDATE_IP) && !empty($_POST['DefaultGateway'])) {
$errors .= _('Invalid default gateway.').'<br />'.PHP_EOL; $errors .= _('Invalid default gateway.').'<br />'.PHP_EOL;
var_dump($_POST['DefaultGateway']);
die();
} }
if (($_POST['dhcp-iface'] == "1")) { if (($_POST['dhcp-iface'] == "1")) {
if (!filter_var($_POST['RangeStart'], FILTER_VALIDATE_IP) && !empty($_POST['RangeStart'])) { if (!filter_var($_POST['RangeStart'], FILTER_VALIDATE_IP) && !empty($_POST['RangeStart'])) {

View File

@ -448,8 +448,8 @@ function ParseConfig($arrConfig)
*/ */
function getNetConfig($interface) function getNetConfig($interface)
{ {
$URI = $_SERVER['REQUEST_SCHEME'].'://'.$_SERVER['SERVER_NAME'] .'/ajax/networking/get_netcfg.php?iface='.$interface; $URI = $_SERVER['REQUEST_SCHEME'].'://' .'localhost'. dirname($_SERVER['SCRIPT_NAME']) .'/ajax/networking/get_netcfg.php?iface='.$interface;
$jsonData = file_get_contents($URI); $jsonData = file_get_contents($URI, true);
return $jsonData; return $jsonData;
} }
@ -757,7 +757,8 @@ function qr_encode($str)
return preg_replace('/(?<!\\\)([\":;,])/', '\\\\\1', $str); return preg_replace('/(?<!\\\)([\":;,])/', '\\\\\1', $str);
} }
function evalHexSequence($string) { function evalHexSequence($string)
{
$evaluator = function ($input) { $evaluator = function ($input) {
return hex2bin($input[1]); return hex2bin($input[1]);
}; };