Remove $DOCUMENTROOT, not used

diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index e75c546c2cb8017b5f79c4dcb68b4aaed42e09af..39ab4ba6ba50b946046f66179835fd176b99e6ec 100644 (file)
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -17,13 +17,6 @@ header("Content-Type: application/xrd+json");
  *
  '* but can also use complex database queries to generate the webfinger result
  **/
-// calculate the documentroot
-// modified version of the one in lib/base.php that takes the .well-known symlink into account
-/*$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
-$SERVERROOT=str_replace("\\",'/',dirname(dirname(dirname(dirname(__FILE__)))));
-$SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen($SERVERROOT));
-$WEBROOT=substr($SUBURI,0,-34);
-*/
 
 $userName = '';
 $hostName = '';

diff --git a/lib/base.php b/lib/base.php
index f85710ddfcf662c7a031a3cc460b26110a069b87..fedc1238851c10923e13797716ff0bfc49fd7516 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -121,8 +121,7 @@ class OC{
        }
 
        public static function initPaths(){
-               // calculate the documentroot
-               $DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
+               // calculate the root directories
                OC::$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-13));
                OC::$SUBURI= str_replace("\\","/",substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen(OC::$SERVERROOT)));
                $scriptName=$_SERVER["SCRIPT_NAME"];
@@ -137,9 +136,6 @@ class OC{
                        }
                }
                 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
-//             OC::$WEBROOT=substr(OC::$SERVERROOT,strlen($DOCUMENTROOT));
-
 
                if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/'){
                        OC::$WEBROOT='/'.OC::$WEBROOT;