adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing

4 files changed, 18 insertions, 0 deletions

diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index c50e96b2429..14ed43cbb3a 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -34,6 +34,7 @@ if($doBreadcrumb) {
 $files = array();
 foreach( \OC\Files\Filesystem::getDirectoryContent( $dir ) as $i ) {
 	$i["date"] = OCP\Util::formatDate($i["mtime"] );
+	$i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
 	$files[] = $i;
 }
 
diff --git a/apps/files/index.php b/apps/files/index.php
index f1e120c872c..4443bf5fde0 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -75,6 +75,7 @@ foreach ($content as $i) {
 	}
 	$i['directory'] = $dir;
 	$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($i['mimetype']);
+	$i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
 	$files[] = $i;
 }
 
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index ec6b4e815f8..ae3e27cab3f 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -19,6 +19,20 @@ function fileCmp($a, $b) {
 	}
 }
 
+function determineIcon($file, $sharingRoot, $sharingToken) {
+	// for folders we simply reuse the files logic
+	if($file['type'] == 'dir') {
+		return \OCA\files\lib\Helper::determineIcon($file);
+	}
+
+	$relativePath = substr($file['path'], 6);
+	$relativePath = substr($relativePath, strlen($sharingRoot));
+	if($file['isPreviewAvailable']) {
+		return OCP\publicPreview_icon($relativePath, $sharingToken);
+	}
+	return OCP\mimetype_icon($file['mimetype']);
+}
+
 if (isset($_GET['t'])) {
 	$token = $_GET['t'];
 	$linkItem = OCP\Share::getShareByToken($token);
@@ -176,6 +190,7 @@ if (isset($path)) {
 				}
 				$i['directory'] = $getPath;
 				$i['permissions'] = OCP\PERMISSION_READ;
+				$i['icon'] = determineIcon($i, $basePath, $token);
 				$files[] = $i;
 			}
 			usort($files, "fileCmp");
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 0baeab1de97..d7eb143f9af 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -65,6 +65,7 @@ foreach ($result as $r) {
 	}
 	$i['permissions'] = OCP\PERMISSION_READ;
 	$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($r['mime']);
+	$i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
 	$files[] = $i;
 }