Merge branch 'master' of gitorious.org:owncloud/owncloud

apps/calendar/ajax/events.php

@@ -11,6 +11,7 @@ require_once('when/When.php');
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
+session_write_close();
 
 // Look for the calendar id
 $calendar_id = null;

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 = '';

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;

remote.php

@@ -5,7 +5,7 @@ require_once('lib/base.php');
 if (array_key_exists('PATH_INFO', $_SERVER)){
 	$path_info = $_SERVER['PATH_INFO'];
 }else{
-	$path_info = substr($_SERVER['PHP_SELF'], strpos($_SERVER['PHP_SELF'], basename(__FILE__)) + strlen(basename(__FILE__)));
+	$path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME']));
 }
 if ($path_info === false) {
 	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);