ConfService: add some includeHooks to contribute with repositories.

pydio · Feb 25, 2016 · bcefb89 · bcefb89
1 parent 793127c
commit bcefb89
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/core/src/core/classes/class.ConfService.php b/core/src/core/classes/class.ConfService.php
@@ -565,9 +565,12 @@ public static function getRepositoriesList($scope = "user", $includeShared = tru
      */
     private function getLoadedRepositories()
     {
-        if (isSet($_SESSION["REPOSITORIES"]) && is_array($_SESSION["REPOSITORIES"])){
-            $this->configs["REPOSITORIES"] = $_SESSION["REPOSITORIES"];
-            return $_SESSION["REPOSITORIES"];
+        if (!isSet($this->configs["REPOSITORIES"]) && isSet($_SESSION["REPOSITORIES"]) && is_array($_SESSION["REPOSITORIES"])){
+            $sessionNotCorrupted = array_reduce($_SESSION["REPOSITORIES"], function($carry, $item){ return $carry && is_a($item, "Repository"); }, true);
+            if($sessionNotCorrupted){
+                $this->configs["REPOSITORIES"] = $_SESSION["REPOSITORIES"];
+                return $_SESSION["REPOSITORIES"];
+            }
         }
         if (isSet($this->configs["REPOSITORIES"])) {
             return $this->configs["REPOSITORIES"];
@@ -687,7 +690,7 @@ public static function repositoryIsAccessible($repositoryId, $repositoryObject,
         }
         $res = null;
         $args = array($repositoryId, $repositoryObject, $userObject, &$res);
-        AJXP_Controller::applyIncludeHook("sec.access_ws", $args);
+        AJXP_Controller::applyIncludeHook("repository.test_access", $args);
         if($res === false){
             return false;
         }
@@ -889,8 +892,8 @@ protected function initRepositoriesListInst($scope = "user", $includeShared = tr
                 $objList[$key] = $value;
             }
         }
-        $args = array(&$objList);
-        AJXP_Controller::applyIncludeHook("sec.access_ws", $args);
+        $args = array(&$objList, $scope, $includeShared);
+        AJXP_Controller::applyIncludeHook("repository.list", $args);
         return $objList;
     }
     /**
@@ -1062,6 +1065,12 @@ public function getRepositoryByIdInst($repoId)
             CacheService::save("repository:".$repoId, $repo);
             return $repo;
         }
+        $hookedRepo = null;
+        $args = array($repoId, &$hookedRepo);
+        AJXP_Controller::applyIncludeHook("repository.search", $args);
+        if($hookedRepo !== null){
+            return $hookedRepo;
+        }
         return null;
     }