ShareStore: make sure to check if sqlSupported before using $this->co…

…nfStorage
pydio · Nov 20, 2014 · 4bcd495 · 4bcd495
1 parent f412d40
commit 4bcd495
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/core/src/.htaccess b/core/src/.htaccess
@@ -23,3 +23,5 @@ RewriteRule (.*) index.php [L]
 #RewriteCond %{HTTP:Authorization} ^(.*)
 #RewriteRule ^(.*) - [E=HTTP_AUTHORIZATION:%1]
 </IfModule>
+
+AddType application/json .json
diff --git a/core/src/plugins/action.share/class.ShareStore.php b/core/src/plugins/action.share/class.ShareStore.php
@@ -164,6 +164,7 @@ public function shareIsLegacy($hash){
     }
 
     public function updateShareProperty($hash, $pName, $pValue){
+        if(!$this->sqlSupported) return false;
         $relatedObjectId = $this->confStorage->simpleStoreGet("share", $hash, "serial", $data);
         if(is_array($data)){
             $data[$pName] = $pValue;
@@ -174,6 +175,7 @@ public function updateShareProperty($hash, $pName, $pValue){
     }
 
     public function findSharesForRepo($repositoryId){
+        if(!$this->sqlSupported) return array();
         return $this->confStorage->simpleStoreList("share", null, "", "serial", '%"REPOSITORY";s:32:"'.$repositoryId.'"%');
     }
 
@@ -189,14 +191,17 @@ protected function updateShareType(&$shareData){
 
     public function listShares($limitToUser = '', $parentRepository = '', $cursor = null, $shareType = null){
 
-        // Get DB files
-        $dbLets = $this->confStorage->simpleStoreList(
-            "share",
-            $cursor,
-            "",
-            "serial",
-            (!empty($limitToUser)?'%"OWNER_ID";s:'.strlen($limitToUser).':"'.$limitToUser.'"%':''),
-            $parentRepository);
+        $dbLets = array();
+        if($this->sqlSupported){
+            // Get DB files
+            $dbLets = $this->confStorage->simpleStoreList(
+                "share",
+                $cursor,
+                "",
+                "serial",
+                (!empty($limitToUser)?'%"OWNER_ID";s:'.strlen($limitToUser).':"'.$limitToUser.'"%':''),
+                $parentRepository);
+        }
 
         // Get hardcoded files
         $files = glob(ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER")."/*.php");