Use the real username in preferences and magic cookie instead of case-insensitive...

diff --git a/lib/base.php b/lib/base.php
index 2e6a37c9f4e854bac44e89c8579283669f03c090..c6e031e61d63380a268bc55a9b20d770049d8122 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -791,14 +791,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();
                        }