diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-08-30 18:11:18 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-30 18:11:18 +0200 |
| commit | 8ef40277b21688112c48d40a9c80a519c3e7460c (patch) | |
| tree | e1dce17e21c734964aec2ae432d03677d7f32d57 /lib/base.php | |
| parent | 40cee5639e89ad052ba5234a28e5f197f2fd70ba (diff) | |
| parent | 0f5df181a3b1f88075193fca0bed88f289314c8e (diff) | |
| download | nextcloud-server-8ef40277b21688112c48d40a9c80a519c3e7460c.tar.gz nextcloud-server-8ef40277b21688112c48d40a9c80a519c3e7460c.zip | |
Merge master into oc_preview
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/lib/base.php b/lib/base.php index 488634f86f3..b5c12a683ff 100644 --- a/lib/base.php +++ b/lib/base.php @@ -264,13 +264,15 @@ class OC { //OC_Util::addScript( "multiselect" ); OC_Util::addScript('search', 'result'); OC_Util::addScript('router'); + OC_Util::addScript("oc-requesttoken"); OC_Util::addStyle("styles"); + OC_Util::addStyle("apps"); + OC_Util::addStyle("fixes"); OC_Util::addStyle("multiselect"); OC_Util::addStyle("jquery-ui-1.10.0.custom"); OC_Util::addStyle("jquery-tipsy"); OC_Util::addStyle("jquery.ocdialog"); - OC_Util::addScript("oc-requesttoken"); } public static function initSession() { @@ -800,14 +802,15 @@ class OC { self::$session->set('timezone', $_POST['timezone-offset']); } - self::cleanupLoginTokens($_POST['user']); + $userid = OC_User::getUser(); + self::cleanupLoginTokens($userid); if (!empty($_POST["remember_login"])) { if (defined("DEBUG") && DEBUG) { OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG); } $token = OC_Util::generate_random_bytes(32); - OC_Preferences::setValue($_POST['user'], 'login_token', $token, time()); - OC_User::setMagicInCookie($_POST["user"], $token); + OC_Preferences::setValue($userid, 'login_token', $token, time()); + OC_User::setMagicInCookie($userid, $token); } else { OC_User::unsetMagicInCookie(); } @@ -823,11 +826,16 @@ class OC { ) { return false; } - OC_App::loadApps(array('authentication')); - if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { - //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG); - OC_User::unsetMagicInCookie(); - $_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister(); + // don't redo authentication if user is already logged in + // otherwise session would be invalidated in OC_User::login with + // session_regenerate_id at every page load + if (!OC_User::isLoggedIn()) { + OC_App::loadApps(array('authentication')); + if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { + //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG); + OC_User::unsetMagicInCookie(); + $_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister(); + } } return true; } |