Fix tmp_repository_id mechanism, was broken.

pydio · May 21, 2016 · dabc448 · dabc448
1 parent 5c330cc
commit dabc448
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/core/src/core/src/pydio/Core/Http/Middleware/AuthMiddleware.php b/core/src/core/src/pydio/Core/Http/Middleware/AuthMiddleware.php
@@ -100,27 +100,24 @@ public static function handleRequest(\Psr\Http\Message\ServerRequestInterface &$
     protected static function bootSessionServer(ServerRequestInterface $request){
 
         $parameters = $request->getParsedBody();
-        if (AuthService::usersEnabled()) {
+        if (isSet($parameters["tmp_repository_id"])) {
+            try{
+                ConfService::switchRootDir($parameters["tmp_repository_id"], true);
+            }catch(PydioException $e){}
+        } else if (isSet($_SESSION["SWITCH_BACK_REPO_ID"])) {
+            ConfService::switchRootDir($_SESSION["SWITCH_BACK_REPO_ID"]);
+            unset($_SESSION["SWITCH_BACK_REPO_ID"]);
+        }
+
 
+        if (AuthService::usersEnabled()) {
             $loggedUser = AuthService::getLoggedUser();
             if ($loggedUser != null) {
                 $res = ConfService::switchUserToActiveRepository($loggedUser, (isSet($parameters["tmp_repository_id"])?$parameters["tmp_repository_id"]:"-1"));
                 if (!$res) {
                     AuthService::disconnect();
                 }
             }
-
-        }else{
-
-            if (isSet($parameters["tmp_repository_id"])) {
-                try{
-                    ConfService::switchRootDir($parameters["tmp_repository_id"], true);
-                }catch(PydioException $e){}
-            } else if (isSet($_SESSION["SWITCH_BACK_REPO_ID"])) {
-                ConfService::switchRootDir($_SESSION["SWITCH_BACK_REPO_ID"]);
-                unset($_SESSION["SWITCH_BACK_REPO_ID"]);
-            }
-
         }
 
         //Set language