Handle Minisite + Lock case - Fix #1278

pydio · Nov 22, 2016 · 1c2acd6 · 1c2acd6
1 parent 00d4dd7
commit 1c2acd6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/core/src/plugins/action.share/src/Http/MinisiteAuthMiddleware.php b/core/src/plugins/action.share/src/Http/MinisiteAuthMiddleware.php
@@ -96,12 +96,15 @@ public static function handleRequest(ServerRequestInterface $requestInterface, R
             ApplicationState::setStateMinisite($hash);
         }
         if(!empty($ctx) && $ctx->hasUser() && isSet($shareData["REPOSITORY"])){
-            $repoObject = UsersService::getRepositoryWithPermission($ctx->getUser(), $shareData["REPOSITORY"]);
-            $ctx->setRepositoryObject($repoObject);
             if($sessions){
                 SessionService::saveRepositoryId($shareData["REPOSITORY"]);
             }
-            $requestInterface = $requestInterface->withAttribute("ctx", $ctx);
+            $uLock = $ctx->getUser()->getLock();
+            if(empty($uLock)){
+                $repoObject = UsersService::getRepositoryWithPermission($ctx->getUser(), $shareData["REPOSITORY"]);
+                $ctx->setRepositoryObject($repoObject);
+                $requestInterface = $requestInterface->withAttribute("ctx", $ctx);
+            }
         }
 
         return Server::callNextMiddleWare($requestInterface, $responseInterface, $next);

diff --git a/core/src/plugins/action.share/src/View/MinisiteRenderer.php b/core/src/plugins/action.share/src/View/MinisiteRenderer.php
@@ -178,7 +178,7 @@ public static function writeHtml(ResponseInterface $responseInterface, ContextIn
             $confs = $shareCenter->getConfigs();
         }
         $repoObject = $context->getRepository();
-        if($repoObject === null && isSet($data['PRESET_LOGIN']) && isSet($data["REPOSITORY"])){
+        if($repoObject === null && (isSet($data['PRESET_LOGIN']) || ($context->hasUser() && $context->getUser()->getLock() !== false)) && isSet($data["REPOSITORY"])){
             $repoObject = RepositoryService::getRepositoryById($data["REPOSITORY"]);
         }