From 29e59c661cf97c59a6a536b2218aae51fcc33da5 Mon Sep 17 00:00:00 2001 From: cdujeu Date: Thu, 5 Mar 2015 21:44:06 +0100 Subject: [PATCH] Fix #847 --- core/src/core/classes/class.ContentFilter.php | 14 ++++++++++++++ .../src/plugins/action.share/class.ShareCenter.php | 6 +++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/core/src/core/classes/class.ContentFilter.php b/core/src/core/classes/class.ContentFilter.php index 16f191dfaf..1519e81902 100644 --- 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; + } + } \ No newline at end of file diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php index f2cff65094..fcb0223b09 100644 --- 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){