diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-23 21:49:35 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-23 21:49:35 +0100 |
| commit | 0a9b8242eeffa16eba84b59603be967d0bcc5bae (patch) | |
| tree | 2e1516957fe3ec1a2f073aa893a18cf2de7e6bc3 | |
| parent | eae6471105920654863f024020af91d219c82013 (diff) | |
| download | nextcloud-server-0a9b8242eeffa16eba84b59603be967d0bcc5bae.tar.gz nextcloud-server-0a9b8242eeffa16eba84b59603be967d0bcc5bae.zip | |
properly initialize OC::$WEBROOT and host name
| -rw-r--r-- | lib/base.php | 27 | ||||
| -rw-r--r-- | lib/private/appframework/http/request.php | 2 |
2 files changed, 17 insertions, 12 deletions
diff --git a/lib/base.php b/lib/base.php index 6048df33f43..1ffeb7bdec4 100644 --- a/lib/base.php +++ b/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::$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; + 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', ''); } - } 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', '&'); diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php index dad5cb050ca..959ea273280 100644 --- a/lib/private/appframework/http/request.php +++ b/lib/private/appframework/http/request.php @@ -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']); |