diff --git a/migration/20.10/migrateCustomXml.php b/migration/20.10/migrateCustomXml.php index 65ba5e7bc71bd129e094d488a5653f9b2b6dd78a..1bbdb83bd3462de2a08ac20f9a80af46f4e7cb6b 100644 --- a/migration/20.10/migrateCustomXml.php +++ b/migration/20.10/migrateCustomXml.php @@ -27,7 +27,7 @@ if (is_file($file)) { } $jsonFile[] = [ 'id' => (string)$value->custom_id, - 'ip' => $ip, + 'uri' => $ip, 'path' => (string)$value->path ]; } diff --git a/src/core/controllers/AuthenticationController.php b/src/core/controllers/AuthenticationController.php index 7f2074c86a7e4693a69530588c594dfb6465b12c..43e51383a7f0b91f4862a4680ddd7e9ba06c09b0 100755 --- a/src/core/controllers/AuthenticationController.php +++ b/src/core/controllers/AuthenticationController.php @@ -63,8 +63,8 @@ class AuthenticationController if (!empty($jsonFile[0]['path'])) { $coreUrl = UrlController::getCoreUrl(); $url = $coreUrl . $jsonFile[0]['path'] . "/dist/index.html"; - } elseif (!empty($jsonFile[0]['ip'])) { - $url = $jsonFile[0]['ip'] . "/dist/index.html"; + } elseif (!empty($jsonFile[0]['uri'])) { + $url = $jsonFile[0]['uri'] . "/dist/index.html"; } return $response->withJson(['url' => $url]); diff --git a/src/core/models/CoreConfigModel.php b/src/core/models/CoreConfigModel.php index 3ad19ab28244b7d1d2a7647980113671b394ff7f..03dba875c11239b8d0b99b4188dd7ede24cdb656 100755 --- a/src/core/models/CoreConfigModel.php +++ b/src/core/models/CoreConfigModel.php @@ -46,7 +46,7 @@ class CoreConfigModel if (!empty($value['path']) && $value['path'] == $path) { $customId = $value['id']; return $customId; - } elseif ($value['ip'] == $_SERVER['HTTP_HOST'] || ($_SERVER['HTTP_HOST'] == $_SERVER['SERVER_ADDR'] && $value['ip'] == $_SERVER['SERVER_ADDR'])) { + } elseif ($value['uri'] == $_SERVER['HTTP_HOST'] || ($_SERVER['HTTP_HOST'] == $_SERVER['SERVER_ADDR'] && $value['uri'] == $_SERVER['SERVER_ADDR'])) { $customId = $value['id']; return $customId; }