Make sure to use === when comparing to constants, or repo 0 can be co…

…nsidered as repo_scope_all. Enable kvcaching in non-rest controller.
pydio · Jan 5, 2016 · 07775c1 · 07775c1
1 parent 55c1efc
commit 07775c1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/core/src/core/classes/class.AJXP_Controller.php b/core/src/core/classes/class.AJXP_Controller.php
@@ -161,7 +161,7 @@ public static function findActionAndApply($actionName, $httpVars, $fileVars, &$a
             self::$lastActionNeedsAuth = true;
             return null;
         }
-        $xPath = self::initXPath();
+        $xPath = self::initXPath(true);
         if ($action == null) {
             $actions = $xPath->query("actions/action[@name='$actionName']");
             if (!$actions->length) {
@@ -471,7 +471,7 @@ public static function applyHook($hookName, $args, $forceNonDefer = false)
             }
             return;
         }
-        $xPath = self::initXPath();
+        $xPath = self::initXPath(true);
         $callbacks = $xPath->query("hooks/serverCallback[@hookName='$hookName']");
         if(!$callbacks->length) return ;
         self::$hooksCache[$hookName] = array();

diff --git a/core/src/core/classes/class.ConfService.php b/core/src/core/classes/class.ConfService.php
@@ -328,8 +328,12 @@ private static function getRegistryCacheKey($extendedVersion = true){
 
         $logged = AuthService::getLoggedUser();
         $u = $logged == null ? "shared" : $logged->getId();
-        $r = ConfService::getRepository();
-        $a = $r->getSlug();
+        if($logged !== null){
+            $r = ConfService::getRepository();
+            $a = $r->getSlug();
+        }else{
+            $a = "norepository";
+        }
         $v = $extendedVersion ? "extended":"light";
         return "xml_registry:".$v.":".$u.":".$a;
 
@@ -368,7 +372,7 @@ public static function filterRegistryFromRole(&$registry)
         }
         $parameters = $loggedUser->mergedRole->listParameters();
         foreach ($parameters as $scope => $paramsPlugs) {
-            if ($scope == AJXP_REPO_SCOPE_ALL || $scope == $crtRepoId || ($crtRepo!=null && $crtRepo->hasParent() && $scope == AJXP_REPO_SCOPE_SHARED)) {
+            if ($scope === AJXP_REPO_SCOPE_ALL || $scope === $crtRepoId || ($crtRepo!=null && $crtRepo->hasParent() && $scope === AJXP_REPO_SCOPE_SHARED)) {
                 foreach ($paramsPlugs as $plugId => $params) {
                     foreach ($params as $name => $value) {
                         // Search exposed plugin_configs, replace if necessary.

diff --git a/core/src/plugins/core.mq/class.MqManager.php b/core/src/plugins/core.mq/class.MqManager.php
@@ -130,7 +130,7 @@ public function publishNodeChange($origNode = null, $newNode = null, $copy = fal
 
     public function sendInstantMessage($xmlContent, $repositoryId, $targetUserId = null, $targetGroupPath = null, $nodePathes = array())
     {
-        if ($repositoryId == AJXP_REPO_SCOPE_ALL) {
+        if ($repositoryId === AJXP_REPO_SCOPE_ALL) {
             $userId = $targetUserId;
         } else {
             $scope = ConfService::getRepositoryById($repositoryId)->securityScope();