From d197f434757c9c21d813584122329b774487f15e Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 27 Nov 2014 14:36:11 +0100
Subject: [PATCH] Use server container
---
lib/private/appframework/app.php | 2 +-
lib/private/server.php | 9 +++++++++
lib/public/iservercontainer.php | 7 +++++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/lib/private/appframework/app.php b/lib/private/appframework/app.php
index 074b6cc3fd..f56ba4af87 100644
--- a/lib/private/appframework/app.php
+++ b/lib/private/appframework/app.php
@@ -69,7 +69,7 @@ class App {
if($value['expireDate'] instanceof \DateTime) {
$expireDate = $value['expireDate']->getTimestamp();
}
- setcookie($name, $value['value'], $expireDate, \OC::$WEBROOT, null, \OC::$server->getConfig()->getSystemValue('forcessl', false), true);
+ setcookie($name, $value['value'], $expireDate, $container->getServer()->getWebRoot(), null, $container->getServer()->getConfig()->getSystemValue('forcessl', false), true);
}
if(!is_null($output)) {
diff --git a/lib/private/server.php b/lib/private/server.php
index c413ee8bf6..e28e836279 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -631,4 +631,13 @@ class Server extends SimpleContainer implements IServerContainer {
function getAppManager() {
return $this->query('AppManager');
}
+
+ /**
+ * Get the webroot
+ *
+ * @return string
+ */
+ function getWebRoot() {
+ return \OC::$WEBROOT;
+ }
}
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index b734d1b416..301f47c68f 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -298,4 +298,11 @@ interface IServerContainer {
* @return \OCP\App\IAppManager
*/
function getAppManager();
+
+ /**
+ * Get the webroot
+ *
+ * @return string
+ */
+ function getWebRoot();
}
--
GitLab