Fix a weird case were updateAdminRights() can actually trigger the re…

…pository list loading BEFORE user is stored in the session, and create an empty repository list.
pydio · Nov 24, 2014 · e5cbea6 · e5cbea6
1 parent 102efe7
commit e5cbea6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/core/src/core/classes/class.AuthService.php b/core/src/core/classes/class.AuthService.php
@@ -370,15 +370,13 @@ public static function logUser($user_id, $pwd, $bypass_pwd = false, $cookieLogin
         if ($authDriver->isAjxpAdmin($user_id)) {
             $user->setAdmin(true);
         }
+        if(self::$useSession) $_SESSION["AJXP_USER"] = $user;
+        else self::$currentUser = $user;
+
         if ($user->isAdmin()) {
             $user = self::updateAdminRights($user);
-        } else {
-            if (!$user->hasParent() && $user_id != "guest") {
-                //$user->setAcl("ajxp_shared", "rw");
-            }
+            self::updateUser($user);
         }
-        if(self::$useSession) $_SESSION["AJXP_USER"] = $user;
-        else self::$currentUser = $user;
 
         if ($authDriver->autoCreateUser() && !$user->storageExists()) {
             $user->save("superuser"); // make sure update rights now

diff --git a/core/src/core/classes/class.ConfService.php b/core/src/core/classes/class.ConfService.php
@@ -215,6 +215,11 @@ public static function getAuthDriverImpl()
         return AJXP_PluginsService::getInstance()->getPluginById("core.auth")->getAuthImpl();
     }
 
+    /**
+     * @param AbstractAjxpUser $loggedUser
+     * @param String|int $parameterId
+     * @return bool
+     */
     public static function switchUserToActiveRepository($loggedUser, $parameterId = -1)
     {
         if (isSet($_SESSION["PENDING_REPOSITORY_ID"]) && isSet($_SESSION["PENDING_FOLDER"])) {