diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2012-10-16 04:46:22 -0700 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2012-10-16 04:46:22 -0700 |
| commit | 59404b567528e15890954775cffe61cae3fdc724 (patch) | |
| tree | b229d6ceeb862547912b41a1ee05f0b78a60c4fe /lib/user.php | |
| parent | b08a1696f5a30321b0073799d6f0984daf392115 (diff) | |
| parent | 8be9c04a3a6f84c8673e0b6db3305cf0f427a43b (diff) | |
| download | nextcloud-server-59404b567528e15890954775cffe61cae3fdc724.tar.gz nextcloud-server-59404b567528e15890954775cffe61cae3fdc724.zip | |
Merge pull request #31 from visit1985/persistentcookies
reresubmit: improved persistent cookies :)
Diffstat (limited to 'lib/user.php')
| -rw-r--r-- | lib/user.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/user.php b/lib/user.php index 7de2a4b7fe6..11373a74014 100644 --- a/lib/user.php +++ b/lib/user.php @@ -329,6 +329,8 @@ class OC_User { } } } + // invalidate all login cookies + OC_Preferences::deleteApp($uid, 'login_token'); OC_Hook::emit( "OC_User", "post_setPassword", array( "uid" => $uid, "password" => $password )); return $success; } @@ -472,9 +474,10 @@ class OC_User { */ public static function setMagicInCookie($username, $token) { $secure_cookie = OC_Config::getValue("forcessl", false); - setcookie("oc_username", $username, time()+60*60*24*15, '', '', $secure_cookie); - setcookie("oc_token", $token, time()+60*60*24*15, '', '', $secure_cookie); - setcookie("oc_remember_login", true, time()+60*60*24*15, '', '', $secure_cookie); + $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); + setcookie("oc_remember_login", true, $expires, '', '', $secure_cookie); } /** |