Use / if installed in main folder

Otherwise an empty string is used indicating the cookie is only valid for those resources. This can lead to eunexpected behaviour. Fixes #19196
owncloud · Oct 6, 2015 · 6a4f22c · 6a4f22c
1 parent 191f1b2
commit 6a4f22c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -79,7 +79,7 @@ public function __construct($appName, $urlParams = array()){
 		});
 
 		$this->registerService('OCP\\AppFramework\\Http\\IOutput', function($c){
-			return new Output();
+			return new Output($this->getServer()->getWebRoot());
 		});
 
 		$this->registerService('OCP\\IAvatarManager', function($c) {

diff --git a/lib/private/appframework/http/output.php b/lib/private/appframework/http/output.php
@@ -27,6 +27,15 @@
  * Very thin wrapper class to make output testable
  */
 class Output implements IOutput {
+	/** @var string */
+	private $webRoot;
+
+	/**
+	 * @param $webRoot
+	 */
+	public function __construct($webRoot) {
+		$this->webRoot = $webRoot;
+	}
 
 	/**
 	 * @param string $out
@@ -72,10 +81,11 @@ public function getHttpResponseCode() {
 	 * @param string $path
 	 * @param string $domain
 	 * @param bool $secure
-	 * @param bool $httponly
+	 * @param bool $httpOnly
 	 */
-	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httponly) {
-		setcookie($name, $value, $expire, $path, $domain, $secure, $httponly);
+	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly) {
+		$path = $this->webRoot ? : '/';
+		setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
 	}
 
 }
diff --git a/lib/public/appframework/http/ioutput.php b/lib/public/appframework/http/ioutput.php
@@ -68,9 +68,9 @@ public function setHttpResponseCode($code);
 	 * @param string $path
 	 * @param string $domain
 	 * @param bool $secure
-	 * @param bool $httponly
+	 * @param bool $httpOnly
 	 * @since 8.1.0
 	 */
-	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httponly);
+	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
 
 }