diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 6cf37761c..809649d17 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -266,6 +266,14 @@ class Context self::set('_http_port', self::$_instance->db_info->http_port = $site_module_info->http_port ?: null); self::set('_https_port', self::$_instance->db_info->https_port = $site_module_info->https_port ?: null); self::set('_use_ssl', self::$_instance->db_info->use_ssl = $site_module_info->security ?: 'none'); + if (PHP_SAPI === 'cli') + { + self::set('_default_url', $default_url = config('url.default')); + if (!defined('RX_BASEURL')) + { + define('RX_BASEURL', parse_url($default_url, PHP_URL_PATH)); + } + } } else { diff --git a/common/constants.php b/common/constants.php index 16dad16b1..3fbc46209 100644 --- a/common/constants.php +++ b/common/constants.php @@ -23,7 +23,7 @@ define('RX_BASEDIR', str_replace('\\', '/', dirname(__DIR__)) . '/'); /** * RX_BASEURL is the CLIENT-SIDE absolute path of Rhymix (with trailing slash, relative to the document root). */ -if (isset($_SERVER['DOCUMENT_ROOT']) && !strncmp(RX_BASEDIR, str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), strlen($_SERVER['DOCUMENT_ROOT']))) +if ($_SERVER['DOCUMENT_ROOT'] && !strncmp(RX_BASEDIR, str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), strlen($_SERVER['DOCUMENT_ROOT']))) { define('RX_BASEURL', str_replace('//', '/', '/' . trim(substr(RX_BASEDIR, strlen($_SERVER['DOCUMENT_ROOT'])), '/') . '/')); } @@ -31,7 +31,7 @@ elseif (isset($_SERVER['PHP_SELF']) && ($pos = strpos($_SERVER['PHP_SELF'], '/in { define('RX_BASEURL', str_replace('//', '/', '/' . trim(str_replace('\\', '/', substr($_SERVER['PHP_SELF'], 0, $pos)), '/') . '/')); } -else +elseif (PHP_SAPI !== 'cli') { define('RX_BASEURL', '/'); }