Small fixes for no-sql drivers

pydio · Sep 15, 2014 · 80c1343 · 80c1343
1 parent 2579c36
commit 80c1343
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/core/src/core/classes/class.AJXP_AbstractMetaSource.php b/core/src/core/classes/class.AJXP_AbstractMetaSource.php
@@ -41,7 +41,7 @@ public function initMeta($accessDriver){
             if($parentRepo != null){
                 $sources = $parentRepo->getOption("META_SOURCES");
                 $qParent = $sources["meta.quota"];
-                $this->options = array_merge($this->options, $qParent);
+                if(is_array($qParent)) $this->options = array_merge($this->options, $qParent);
             }
         }
 

diff --git a/core/src/core/classes/class.ConfService.php b/core/src/core/classes/class.ConfService.php
@@ -525,7 +525,7 @@ public static function filterRepositoryListWithCriteria($repoList, $criteria){
                     $repositories[$repoId] = $repoObject;
                 }else if($value == AJXP_FILTER_NOT_EMPTY && !empty($comp)){
                     $repositories[$repoId] = $repoObject;
-                }else if(strpos($value, "regexp:")===0 && preg_match(str_replace("regexp:", "", $value), $comp)){
+                }else if(is_string($value) && strpos($value, "regexp:")===0 && preg_match(str_replace("regexp:", "", $value), $comp)){
                     $repositories[$repoId] = $repoObject;
                 }else if($value == $comp){
                     $repositories[$repoId] = $repoObject;

diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php
@@ -1515,7 +1515,7 @@ public function createSharedRepository($httpVars, $repository, $accessDriver, $u
             return 100;
         }
         $foldersharing = $this->getFilteredOption("ENABLE_FOLDER_SHARING", $this->repository->getId());
-        if (isset($foldersharing) && ($foldersharing === false || $foldersharing == "disable" )) {
+        if (isset($foldersharing) && ($foldersharing === false || (is_string($foldersharing) && $foldersharing == "disable"))) {
             return 103;
         }
         $loggedUser = AuthService::getLoggedUser();

diff --git a/core/src/plugins/action.share/class.ShareStore.php b/core/src/plugins/action.share/class.ShareStore.php
@@ -87,6 +87,9 @@ public function storeShare($parentRepositoryId, $shareData, $type="minisite", $e
             $this->confStorage->simpleStoreSet("share", $hash, $shareData, "serial", $parentRepositoryId);
             return $hash;
         }
+        if(!empty($existingHash)){
+            throw new Exception("Current storage method does not support parameters edition!");
+        }
 
         $loader = 'ShareCenter::loadMinisite($data);';
         if($type == "publiclet"){