[Pkg-owncloud-commits] [owncloud] 09/103: fix filepicker

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v8.0.4RC1
in repository owncloud.

commit 1e60931119ebd350d6d6ad6fba0dba2c94c9a177
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Mon Apr 13 10:35:45 2015 +0200

    fix filepicker
    
    * add ability to filter for mimetype
    * fixes #15526
    * fixes #11563
---
 apps/files/ajax/list.php  | 26 ++++++++++++++++++++++++--
 apps/files/lib/helper.php |  5 +++--
 core/js/oc-dialogs.js     |  2 +-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index 4aed79d..f9facd0 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -22,10 +22,32 @@ try {
 
 	$sortAttribute = isset($_GET['sort']) ? $_GET['sort'] : 'name';
 	$sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
+	$mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : '';
 
-	// make filelist
+	$files = [];
+	// Clean up duplicates from array
+	if (is_array($mimetypeFilters) && count($mimetypeFilters)) {
+		$mimetypeFilters = array_unique($mimetypeFilters);
+
+		if (!in_array('httpd/unix-directory', $mimetypeFilters)) {
+			// append folder filter to be able to browse folders
+			$mimetypeFilters[] = 'httpd/unix-directory';
+		}
+
+		// create filelist with mimetype filter - as getFiles only supports on
+		// mimetype filter at once we will filter this folder for each
+		// mimetypeFilter
+		foreach ($mimetypeFilters as $mimetypeFilter) {
+			$files = array_merge($files, \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection, $mimetypeFilter));
+		}
+
+		// sort the files accordingly
+		$files = \OCA\Files\Helper::sortFiles($files, $sortAttribute, $sortDirection);
+	} else {
+		// create file list without mimetype filter
+		$files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
+	}
 
-	$files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
 	$files = \OCA\Files\Helper::populateTags($files);
 	$data['directory'] = $dir;
 	$data['files'] = \OCA\Files\Helper::formatFileInfos($files);
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index 84b1a0f..d92e696 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -170,10 +170,11 @@ class Helper
 	 * @param string $dir path to the directory
 	 * @param string $sortAttribute attribute to sort on
 	 * @param bool $sortDescending true for descending sort, false otherwise
+	 * @param string $mimetypeFilter limit returned content to this mimetype or mimepart
 	 * @return \OCP\Files\FileInfo[] files
 	 */
-	public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false) {
-		$content = \OC\Files\Filesystem::getDirectoryContent($dir);
+	public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false, $mimetypeFilter = '') {
+		$content = \OC\Files\Filesystem::getDirectoryContent($dir, $mimetypeFilter);
 
 		return self::sortFiles($content, $sortAttribute, $sortDescending);
 	}
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 0c046d8..f3bf436 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -138,7 +138,7 @@ var OCdialogs = {
 	 * @param title dialog title
 	 * @param callback which will be triggered when user presses Choose
 	 * @param multiselect whether it should be possible to select multiple files
-	 * @param mimetypeFilter mimetype to filter by
+	 * @param mimetypeFilter mimetype to filter by - directories will always be included
 	 * @param modal make the dialog modal
 	*/
 	filepicker:function(title, callback, multiselect, mimetypeFilter, modal) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git