Pass "minisite" attribute to the request - Disable Task enqueing if i…

…t's set, as there is no TaskService and NotificationsLoaded in minisite
pydio · Sep 8, 2016 · 6df6966 · 6df6966
1 parent 84d3cf4
commit 6df6966
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/core/src/plugins/access.fs/FsAccessDriver.php b/core/src/plugins/access.fs/FsAccessDriver.php
@@ -901,7 +901,7 @@ public function switchAction(ServerRequestInterface &$request, ResponseInterface
                 }
                 $size = 0;
                 $nodes = $selection->buildNodes();
-                $bgSizeThreshold = 1*1024*1024;
+                $bgSizeThreshold = 10*1024*1024;
                 $bgWorkerThreshold = 80*1024*1024;
                 if(!MetaStreamWrapper::wrapperIsRemote($selection->currentBaseUrl())){
                     foreach($nodes as $node){

diff --git a/core/src/plugins/action.share/src/Http/MinisiteServer.php b/core/src/plugins/action.share/src/Http/MinisiteServer.php
@@ -57,7 +57,7 @@ public function __construct($base, $linkHash, $rest = false)
     {
         $this->crtLinkHash = $linkHash;
         $this->rest = $rest;
-        parent::__construct($base);
+        parent::__construct($base, []);
         if($rest){
             ConfService::currentContextIsRestAPI($base);
         }

diff --git a/core/src/plugins/action.share/src/ShareCenter.php b/core/src/plugins/action.share/src/ShareCenter.php
@@ -222,8 +222,7 @@ public static function publicRoute($serverBase, $route, $params){
             $base = new Base();
             $h = $_GET['minisite_session'];
             SessionService::setSessionName("AjaXplorer_Shared".str_replace(".","_",$h));
-
+            $base->handleRoute($serverBase, "/", ["minisite" => true]);
-            $base->handleRoute($serverBase, "/");
 
         }else{
 

diff --git a/core/src/plugins/core.access/src/Model/AJXP_Node.php b/core/src/plugins/core.access/src/Model/AJXP_Node.php
@@ -358,7 +358,7 @@ public function copyOrMoveMetadataFromNode($originalNode, $nameSpace, $operation
      */
     public function getParent(){
 
-        if(empty($this->urlParts["path"]) || $this->urlParts["path"] == "/"){
+        if(empty($this->urlParts["path"]) || $this->urlParts["path"] === "/"){
             return null;
         }
         $parent = new AJXP_Node(dirname($this->_url));

diff --git a/core/src/plugins/core.tasks/src/TaskService.php b/core/src/plugins/core.tasks/src/TaskService.php
@@ -91,7 +91,9 @@ public function enqueueTask(Task $task, ServerRequestInterface $request = null,
             return $response;
         }
 
-        if(ConfService::backgroundActionsSupported() && !ConfService::currentContextIsCommandLine()) {
+        $minisite = $request !== null && $request->getAttribute("minisite");
+
+        if(ConfService::backgroundActionsSupported() && !ConfService::currentContextIsCommandLine() && !$minisite) {
 
             CliRunner::applyTaskInBackground($task);
             return $response;