properly initialize OC::$WEBROOT and host name
This commit is contained in:
parent
eae6471105
commit
0a9b8242ee
29
lib/base.php
29
lib/base.php
|
@ -152,18 +152,22 @@ class OC {
|
|||
}
|
||||
}
|
||||
|
||||
if (substr($scriptName, 0 - strlen(OC::$SUBURI)) === OC::$SUBURI) {
|
||||
OC::$WEBROOT = substr($scriptName, 0, 0 - strlen(OC::$SUBURI));
|
||||
|
||||
if (OC::$WEBROOT != '' && OC::$WEBROOT[0] !== '/') {
|
||||
OC::$WEBROOT = '/' . OC::$WEBROOT;
|
||||
}
|
||||
} else {
|
||||
// The scriptName is not ending with OC::$SUBURI
|
||||
// This most likely means that we are calling from CLI.
|
||||
// However some cron jobs still need to generate
|
||||
// a web URL, so we use overwritewebroot as a fallback.
|
||||
if (OC::$CLI) {
|
||||
OC::$WEBROOT = OC_Config::getValue('overwritewebroot', '');
|
||||
} else {
|
||||
if (substr($scriptName, 0 - strlen(OC::$SUBURI)) === OC::$SUBURI) {
|
||||
OC::$WEBROOT = substr($scriptName, 0, 0 - strlen(OC::$SUBURI));
|
||||
|
||||
if (OC::$WEBROOT != '' && OC::$WEBROOT[0] !== '/') {
|
||||
OC::$WEBROOT = '/' . OC::$WEBROOT;
|
||||
}
|
||||
} else {
|
||||
// The scriptName is not ending with OC::$SUBURI
|
||||
// This most likely means that we are calling from CLI.
|
||||
// However some cron jobs still need to generate
|
||||
// a web URL, so we use overwritewebroot as a fallback.
|
||||
OC::$WEBROOT = OC_Config::getValue('overwritewebroot', '');
|
||||
}
|
||||
}
|
||||
|
||||
// search the 3rdparty folder
|
||||
|
@ -516,6 +520,8 @@ class OC {
|
|||
spl_autoload_register(array(self::$loader, 'load'));
|
||||
$loaderEnd = microtime(true);
|
||||
|
||||
self::$CLI = (php_sapi_name() == 'cli');
|
||||
|
||||
self::initPaths();
|
||||
|
||||
// setup 3rdparty autoloader
|
||||
|
@ -541,7 +547,6 @@ class OC {
|
|||
if (defined('DEBUG') && DEBUG) {
|
||||
ini_set('display_errors', 1);
|
||||
}
|
||||
self::$CLI = (php_sapi_name() == 'cli');
|
||||
|
||||
date_default_timezone_set('UTC');
|
||||
ini_set('arg_separator.output', '&');
|
||||
|
|
|
@ -625,7 +625,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
|
|||
* @return string Server host
|
||||
*/
|
||||
public function getInsecureServerHost() {
|
||||
$host = null;
|
||||
$host = 'localhost';
|
||||
if (isset($this->server['HTTP_X_FORWARDED_HOST'])) {
|
||||
if (strpos($this->server['HTTP_X_FORWARDED_HOST'], ',') !== false) {
|
||||
$parts = explode(',', $this->server['HTTP_X_FORWARDED_HOST']);
|
||||
|
|
Loading…
Reference in New Issue