Fix #847

pydio · Mar 5, 2015 · 29e59c6 · 29e59c6
1 parent b256426
commit 29e59c6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/core/src/core/classes/class.ContentFilter.php b/core/src/core/classes/class.ContentFilter.php
@@ -107,4 +107,18 @@ public function movePath($oldPath, $newPath){
 
     }
 
+    /**
+     * @return Return public data as array, pre-utf8 encoded
+     */
+    public function toArray(){
+        $data = array("filters" => array(), "virtualPaths" => array());
+        foreach($this->filters as $k => $v){
+            $data["filters"][SystemTextEncoding::toUTF8($k)] = SystemTextEncoding::toUTF8($v);
+        }
+        foreach($this->virtualPaths as $k => $v){
+            $data["virtualPaths"][SystemTextEncoding::toUTF8($k)] = SystemTextEncoding::toUTF8($v);
+        }
+        return $data;
+    }
+
 } 
diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php
@@ -2466,6 +2466,10 @@ public function shareToJson($shareId, $shareData, $node = null){
                 $sharedEntries = $this->computeSharedRepositoryAccessRights($repoId, true, null);
             }
 
+            $cFilter = $repo->getContentFilter();
+            if(!empty($cFilter)){
+                $cFilter = $cFilter->toArray();
+            }
             $jsonData = array(
                 "repositoryId"  => $repoId,
                 "users_number"  => AuthService::countUsersForRepository($repoId),
@@ -2474,7 +2478,7 @@ public function shareToJson($shareId, $shareData, $node = null){
                 "entries"       => $sharedEntries,
                 "element_watch" => $elementWatch,
                 "repository_url"=> AJXP_Utils::detectServerURL(true)."?goto=". $repo->getSlug() ."/",
-                "content_filter"=> $repo->getContentFilter()
+                "content_filter"=> $cFilter
             );
             if (isSet($minisiteData)) {
                 if(!empty($minisiteData["DOWNLOAD_LIMIT"]) && !$dlDisabled){