fix some SERVER_NAME references
This commit is contained in:
@@ -1630,10 +1630,11 @@ class System
|
|||||||
public static function getServerHostname()
|
public static function getServerHostname()
|
||||||
{
|
{
|
||||||
$host = "";
|
$host = "";
|
||||||
if (!empty($_SERVER['SERVER_NAME'])) {
|
if (defined('SERVER_NAME')) {
|
||||||
$host = $_SERVER['SERVER_NAME'];
|
|
||||||
} else if (defined('SERVER_NAME')) {
|
|
||||||
$host = SERVER_NAME;
|
$host = SERVER_NAME;
|
||||||
|
} else {
|
||||||
|
$hostParts = explode(':', $_SERVER['HTTP_HOST'] ?? '');
|
||||||
|
$host = isset($hostParts[0]) ? $hostParts[0] : $_SERVER['SERVER_NAME'];
|
||||||
}
|
}
|
||||||
return $host;
|
return $host;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -447,11 +447,11 @@ define('PATH_DATA_REPORTS', PATH_DATA_SITE . 'reports/');
|
|||||||
define('PATH_DYNAFORM', PATH_DATA_SITE . 'xmlForms/');
|
define('PATH_DYNAFORM', PATH_DATA_SITE . 'xmlForms/');
|
||||||
define('PATH_IMAGES_ENVIRONMENT_FILES', PATH_DATA_SITE . 'usersFiles' . PATH_SEP);
|
define('PATH_IMAGES_ENVIRONMENT_FILES', PATH_DATA_SITE . 'usersFiles' . PATH_SEP);
|
||||||
define('PATH_IMAGES_ENVIRONMENT_USERS', PATH_DATA_SITE . 'usersPhotographies' . PATH_SEP);
|
define('PATH_IMAGES_ENVIRONMENT_USERS', PATH_DATA_SITE . 'usersPhotographies' . PATH_SEP);
|
||||||
define('SERVER_NAME', $_SERVER['SERVER_NAME']);
|
|
||||||
|
|
||||||
$hostParts = explode(':', $_SERVER['HTTP_HOST'] ?? '');
|
$hostParts = explode(':', $_SERVER['HTTP_HOST'] ?? '');
|
||||||
$port = isset($hostParts[1]) && is_numeric($hostParts[1]) ? (int)$hostParts[1] : $_SERVER['SERVER_PORT'];
|
$port = isset($hostParts[1]) && is_numeric($hostParts[1]) ? (int)$hostParts[1] : $_SERVER['SERVER_PORT'];
|
||||||
|
$host = isset($hostParts[0]) ? $hostParts[0] : $_SERVER['SERVER_NAME'];
|
||||||
|
define('SERVER_NAME', $host);
|
||||||
define('SERVER_PORT', $port);
|
define('SERVER_PORT', $port);
|
||||||
|
|
||||||
// create memcached singleton
|
// create memcached singleton
|
||||||
|
|||||||
Reference in New Issue
Block a user