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

remotes/origin/stable6
Thomas Müller 11 years ago
parent 5af111b0de
commit 9d661eab23
  1. 1
      apps/files/ajax/list.php
  2. 1
      apps/files/index.php
  3. 15
      apps/files_sharing/public.php
  4. 1
      apps/files_trashbin/index.php

@ -34,6 +34,7 @@ if($doBreadcrumb) {
$files = array(); $files = array();
foreach( \OC\Files\Filesystem::getDirectoryContent( $dir ) as $i ) { foreach( \OC\Files\Filesystem::getDirectoryContent( $dir ) as $i ) {
$i["date"] = OCP\Util::formatDate($i["mtime"] ); $i["date"] = OCP\Util::formatDate($i["mtime"] );
$i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
$files[] = $i; $files[] = $i;
} }

@ -75,6 +75,7 @@ foreach ($content as $i) {
} }
$i['directory'] = $dir; $i['directory'] = $dir;
$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($i['mimetype']); $i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($i['mimetype']);
$i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
$files[] = $i; $files[] = $i;
} }

@ -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'])) { if (isset($_GET['t'])) {
$token = $_GET['t']; $token = $_GET['t'];
$linkItem = OCP\Share::getShareByToken($token); $linkItem = OCP\Share::getShareByToken($token);
@ -176,6 +190,7 @@ if (isset($path)) {
} }
$i['directory'] = $getPath; $i['directory'] = $getPath;
$i['permissions'] = OCP\PERMISSION_READ; $i['permissions'] = OCP\PERMISSION_READ;
$i['icon'] = determineIcon($i, $basePath, $token);
$files[] = $i; $files[] = $i;
} }
usort($files, "fileCmp"); usort($files, "fileCmp");

@ -65,6 +65,7 @@ foreach ($result as $r) {
} }
$i['permissions'] = OCP\PERMISSION_READ; $i['permissions'] = OCP\PERMISSION_READ;
$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($r['mime']); $i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($r['mime']);
$i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
$files[] = $i; $files[] = $i;
} }

Loading…
Cancel
Save