summaryrefslogtreecommitdiffstats
path: root/lib/private/user
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/user')
-rw-r--r--lib/private/user/database.php2
-rw-r--r--lib/private/user/session.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/user/database.php b/lib/private/user/database.php
index 3969b446071..98850771212 100644
--- a/lib/private/user/database.php
+++ b/lib/private/user/database.php
@@ -266,7 +266,7 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend {
*/
public function getHome($uid) {
if ($this->userExists($uid)) {
- return OC_Config::getValue("datadirectory", OC::$SERVERROOT . "/data") . '/' . $uid;
+ return \OC::$server->getConfig()->getSystemValue("datadirectory", OC::$SERVERROOT . "/data") . '/' . $uid;
}
return false;
diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index baceeb43956..ba702c9f365 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -287,7 +287,7 @@ class Session implements IUserSession, Emitter {
*/
public function setMagicInCookie($username, $token) {
$secureCookie = \OC::$server->getRequest()->getServerProtocol() === 'https';
- $expires = time() + \OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
+ $expires = time() + \OC::$server->getConfig()->getSystemValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
setcookie("oc_username", $username, $expires, \OC::$WEBROOT, '', $secureCookie, true);
setcookie("oc_token", $token, $expires, \OC::$WEBROOT, '', $secureCookie, true);
setcookie("oc_remember_login", "1", $expires, \OC::$WEBROOT, '', $secureCookie, true);