From: Georg Ehrke <developer@georgehrke.com>
Date: Wed, 21 Aug 2013 13:55:59 +0000 (+0200)
Subject: move isMimeSupported out of template files
X-Git-Tag: v6.0.0alpha2~235^2~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=224b80f906c1b7cd6338854e58f228eff4ea871c;p=nextcloud-server.git

move isMimeSupported out of template files
---

diff --git a/apps/files/index.php b/apps/files/index.php
index c05c2a9384d..3007f56e024 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -74,6 +74,7 @@ foreach ($content as $i) {
 		}
 	}
 	$i['directory'] = $dir;
+	$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($i['mimetype']);
 	$files[] = $i;
 }
 
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 899fb04e252..c91dda4c77e 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -26,7 +26,7 @@ $totalsize = 0; ?>
 		data-mime="<?php p($file['mimetype'])?>"
 		data-size="<?php p($file['size']);?>"
 		data-permissions="<?php p($file['permissions']); ?>">
-		<?php if(\OCP\Preview::isMimeSupported($file['mimetype'])): ?>
+		<?php if($file['isPreviewAvailable']): ?>
 		<td class="filename svg preview-icon"
 		<?php else: ?>
 		<td class="filename svg"
@@ -38,13 +38,13 @@ $totalsize = 0; ?>
 				<?php
 				$relativePath = substr($relativePath, strlen($_['sharingroot']));
 				?>
-				<?php if(\OCP\Preview::isMimeSupported($file['mimetype'])): ?>
+				<?php if($file['isPreviewAvailable']): ?>
 				style="background-image:url(<?php print_unescaped(OCP\publicPreview_icon($relativePath, $_['sharingtoken'])); ?>)"
 				<?php else: ?>
 				style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
 				<?php endif; ?>
 			<?php else: ?>
-				<?php if(\OCP\Preview::isMimeSupported($file['mimetype'])): ?>	
+				<?php if($file['isPreviewAvailable']): ?>
 				style="background-image:url(<?php print_unescaped(OCP\preview_icon($relativePath)); ?>)"
 				<?php else: ?>
 				style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index f050fecd7b5..ec6b4e815f8 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -172,6 +172,7 @@ if (isset($path)) {
 					} else {
 						$i['extension'] = '';
 					}
+					$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($i['mimetype']);
 				}
 				$i['directory'] = $getPath;
 				$i['permissions'] = OCP\PERMISSION_READ;
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 2dbaefe7a78..6ae238eb8eb 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -64,6 +64,7 @@ foreach ($result as $r) {
 		$i['directory'] = '';
 	}
 	$i['permissions'] = OCP\PERMISSION_READ;
+	$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($r['mime']);
 	$files[] = $i;
 }
 
diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php
index 6c6d2162846..f7cc6b01bbb 100644
--- a/apps/files_trashbin/templates/part.list.php
+++ b/apps/files_trashbin/templates/part.list.php
@@ -21,12 +21,16 @@
 		data-timestamp='<?php p($file['timestamp']);?>'
 		data-dirlisting=0
 		<?php endif; ?>>
+		<?php if($file['isPreviewAvailable']): ?>
+		<td class="filename svg preview-icon"
+		<?php else: ?>
 		<td class="filename svg"
+		<?php endif; ?>
 		<?php if($file['type'] === 'dir'): ?>
 			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
 		<?php else: ?>
-				<?php if(\OCP\Preview::isMimeSupported($file['mimetype'])): ?>
-				style="background-image:url(<?php print_unescaped(OCA\Files_Trashbin\Trashbin::preview_icon(!$_['dirlisting'] ? ($file['name'].'.d'.$file['timestamp']) : ($file['directory'].'/'.$file['name']))); ?>)" class="preview-icon"
+				<?php if($file['isPreviewAvailable']): ?>
+				style="background-image:url(<?php print_unescaped(OCA\Files_Trashbin\Trashbin::preview_icon(!$_['dirlisting'] ? ($file['name'].'.d'.$file['timestamp']) : ($file['directory'].'/'.$file['name']))); ?>)"
 				<?php else: ?>
 				style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
 				<?php endif; ?>