[Pkg-owncloud-commits] [owncloud] 17/172: typos, indentation and remove of unused code

David Prévot taffit at moszumanska.debian.org
Sun May 18 20:09:35 UTC 2014


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

taffit pushed a commit to branch master
in repository owncloud.

commit 535302b25eadf982b0c1572221bde7dee4ebe52a
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Apr 28 17:59:50 2014 +0200

    typos, indentation and remove of unused code
---
 apps/files/js/filelist.js      |  2 +-
 apps/files/lib/helper.php      | 11 +++++------
 apps/files/templates/index.php |  1 +
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 04c5a8f..11d3354 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -976,7 +976,7 @@ window.FileList = {
 						OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error'));
 					}
 					$td.css('background-image', oldBackgroundImage);
-			});
+				});
 		});
 
 	},
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index b23c1d1..7e0f47b 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -18,12 +18,12 @@ class Helper
 		$storageInfo = \OC_Helper::getStorageInfo($dir);
 
 		$l = new \OC_L10N('files');
-		$maxUploadFilesize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
-		$maxHumanFilesize = \OCP\Util::humanFileSize($maxUploadFilesize);
-		$maxHumanFilesize = $l->t('Upload (max. %s)', array($maxHumanFilesize));
+		$maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
+		$maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
+		$maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize));
 
-		return array('uploadMaxFilesize' => $maxUploadFilesize,
-					 'maxHumanFilesize'  => $maxHumanFilesize,
+		return array('uploadMaxFilesize' => $maxUploadFileSize,
+					 'maxHumanFilesize'  => $maxHumanFileSize,
 					 'freeSpace' => $storageInfo['free'],
 					 'usedSpacePercent'  => (int)$storageInfo['relative']);
 	}
@@ -36,7 +36,6 @@ class Helper
 	 */
 	public static function determineIcon($file) {
 		if($file['type'] === 'dir') {
-			$dir = $file['directory'];
 			$icon = \OC_Helper::mimetypeIcon('dir');
 			$absPath = $file->getPath();
 			$mount = \OC\Files\Filesystem::getMountManager()->find($absPath);
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 822aee0..9c593a9 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -1,3 +1,4 @@
+<?php /** @var $l OC_L10N */ ?>
 <div id="controls">
 		<div class="actions creatable hidden">
 			<?php if(!isset($_['dirToken'])):?>

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



More information about the Pkg-owncloud-commits mailing list