mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove DOCUMENTROOT static var, and make SUBURI var private

This commit is contained in:
Bart Visscher 2012-05-11 21:31:51 +02:00
parent 9a66b869c0
commit 97233b77cd
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/base.php
View File

@ -30,10 +30,6 @@ class OC{
* Assoziative array for autoloading. classname => filename * Assoziative array for autoloading. classname => filename
*/ */
public static $CLASSPATH = array(); public static $CLASSPATH = array();
/**
* $_SERVER['DOCUMENTROOT'] but without symlinks
*/
public static $DOCUMENTROOT = '';
/** /**
* The installation path for owncloud on the server (e.g. /srv/http/owncloud) * The installation path for owncloud on the server (e.g. /srv/http/owncloud)
*/ */
@ -41,7 +37,7 @@ class OC{
/** /**
* the current request path relative to the owncloud root (e.g. files/index.php) * the current request path relative to the owncloud root (e.g. files/index.php)
*/ */
public static $SUBURI = ''; private static $SUBURI = '';
/** /**
* the owncloud root path for http requests (e.g. owncloud/) * the owncloud root path for http requests (e.g. owncloud/)
*/ */
@ -122,7 +118,7 @@ class OC{
public static function initPaths(){ public static function initPaths(){
// calculate the documentroot // calculate the documentroot
OC::$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']); $DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
OC::$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-13)); OC::$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-13));
OC::$SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen(OC::$SERVERROOT)); OC::$SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen(OC::$SERVERROOT));
$scriptName=$_SERVER["SCRIPT_NAME"]; $scriptName=$_SERVER["SCRIPT_NAME"];
@ -138,7 +134,7 @@ class OC{
} }
OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI)); OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI));
// try a new way to detect the WEBROOT which is simpler and also works with the app directory outside the owncloud folder. let´s see if this works for everybody // try a new way to detect the WEBROOT which is simpler and also works with the app directory outside the owncloud folder. let´s see if this works for everybody
// OC::$WEBROOT=substr(OC::$SERVERROOT,strlen(OC::$DOCUMENTROOT)); // OC::$WEBROOT=substr(OC::$SERVERROOT,strlen($DOCUMENTROOT));
if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/'){ if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/'){