diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-04-06 00:16:52 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-04-06 00:16:52 +0200 |
| commit | fbffbe0170d4a47cdefaaf99a3dfa4008de0f886 (patch) | |
| tree | ee02b87e4038ab27170970df223832b65adbc1b0 /lib | |
| parent | 6798b6dc349e8754c4a5bf13b6ac7530bf12e931 (diff) | |
| download | nextcloud-server-fbffbe0170d4a47cdefaaf99a3dfa4008de0f886.tar.gz nextcloud-server-fbffbe0170d4a47cdefaaf99a3dfa4008de0f886.zip | |
Juse send the cookies in the ownCloud directory
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 5 | ||||
| -rw-r--r-- | lib/user.php | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/base.php b/lib/base.php index 76ad0654ed0..dde994a7e57 100644 --- a/lib/base.php +++ b/lib/base.php @@ -323,6 +323,9 @@ class OC { // prevents javascript from accessing php session cookies ini_set('session.cookie_httponly', '1;'); + // set the cookie path to the ownCloud directory + ini_set('session.cookie_path', OC::$WEBROOT); + // set the session name to the instance id - which is unique session_name(OC_Util::getInstanceId()); @@ -354,7 +357,7 @@ class OC { // session timeout if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 60*60*24)) { if (isset($_COOKIE[session_name()])) { - setcookie(session_name(), '', time() - 42000, '/'); + setcookie(session_name(), '', time() - 42000, OC::$WEBROOT); } session_unset(); session_destroy(); diff --git a/lib/user.php b/lib/user.php index 33e25268175..b19af940795 100644 --- a/lib/user.php +++ b/lib/user.php @@ -633,9 +633,9 @@ class OC_User { public static function setMagicInCookie($username, $token) { $secure_cookie = OC_Config::getValue("forcessl", false); $expires = time() + OC_Config::getValue('remember_login_cookie_lifetime', 60*60*24*15); - setcookie("oc_username", $username, $expires, '', '', $secure_cookie); - setcookie("oc_token", $token, $expires, '', '', $secure_cookie, true); - setcookie("oc_remember_login", true, $expires, '', '', $secure_cookie); + setcookie("oc_username", $username, $expires, OC::$WEBROOT, '', $secure_cookie); + setcookie("oc_token", $token, $expires, OC::$WEBROOT, '', $secure_cookie, true); + setcookie("oc_remember_login", true, $expires, OC::$WEBROOT, '', $secure_cookie); } /** |