| @@ -2,17 +2,17 @@ | ||
| 2 | 2 | |
| 3 | 3 | <div class="section"> | 
| 4 | 4 |  		<h2><?php p($l->t('File handling')); ?></h2> | 
| 5 | - <label for="maxUploadSize"><?php p($l->t( 'Maximum upload size' )); ?> </label> | |
| 5 | +		<label for="maxUploadSize"><?php p($l->t('Maximum upload size')); ?> </label> | |
| 6 | 6 | <span id="maxUploadSizeSettingsMsg" class="msg"></span> | 
| 7 | 7 | <br /> | 
| 8 | -		<input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if(!$_['uploadChangable']) { p('disabled'); } ?> /> | |
| 9 | - <?php if($_['displayMaxPossibleUploadSize']):?> | |
| 8 | +		<input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if (!$_['uploadChangable']) { p('disabled'); } ?> /> | |
| 9 | + <?php if ($_['displayMaxPossibleUploadSize']):?> | |
| 10 | 10 |  			(<?php p($l->t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>) | 
| 11 | - <?php endif;?> | |
| 11 | + <?php endif; ?> | |
| 12 | 12 | <input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" /> | 
| 13 | - <?php if($_['uploadChangable']): ?> | |
| 13 | + <?php if ($_['uploadChangable']): ?> | |
| 14 | 14 | <input type="submit" id="submitMaxUpload" | 
| 15 | - value="<?php p($l->t( 'Save' )); ?>"/> | |
| 15 | +				   value="<?php p($l->t('Save')); ?>"/> | |
| 16 | 16 |  			<p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p> | 
| 17 | 17 | <?php else: ?> | 
| 18 | 18 |  			<p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p> | 
| @@ -26,7 +26,7 @@ | ||
| 26 | 26 | $dir = '/'; | 
| 27 | 27 | |
| 28 | 28 |  if (isset($_GET['dir'])) { | 
| 29 | - $dir = (string)$_GET['dir']; | |
| 29 | + $dir = (string) $_GET['dir']; | |
| 30 | 30 | } | 
| 31 | 31 | |
| 32 | 32 | OCP\JSON::checkLoggedIn(); | 
| @@ -28,7 +28,7 @@ discard block | ||
| 28 | 28 |  $l = \OC::$server->getL10N('files'); | 
| 29 | 29 | |
| 30 | 30 | // Load the files | 
| 31 | -$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : ''; | |
| 31 | +$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : ''; | |
| 32 | 32 | $dir = \OC\Files\Filesystem::normalizePath($dir); | 
| 33 | 33 | |
| 34 | 34 |  try { | 
| @@ -39,11 +39,11 @@ discard block | ||
| 39 | 39 | } | 
| 40 | 40 | |
| 41 | 41 | $data = array(); | 
| 42 | -	$baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir='; | |
| 42 | +	$baseUrl = OCP\Util::linkTo('files', 'index.php').'?dir='; | |
| 43 | 43 | |
| 44 | 44 | $permissions = $dirInfo->getPermissions(); | 
| 45 | 45 | |
| 46 | - $sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name'; | |
| 46 | + $sortAttribute = isset($_GET['sort']) ? (string) $_GET['sort'] : 'name'; | |
| 47 | 47 | $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false; | 
| 48 | 48 | $mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : ''; | 
| 49 | 49 | |
| @@ -197,7 +197,7 @@ | ||
| 197 | 197 |  	protected function setSubjects(IEvent $event, $subject, array $parameters) { | 
| 198 | 198 | $placeholders = $replacements = []; | 
| 199 | 199 |  		foreach ($parameters as $placeholder => $parameter) { | 
| 200 | -			$placeholders[] = '{' . $placeholder . '}'; | |
| 200 | +			$placeholders[] = '{'.$placeholder.'}'; | |
| 201 | 201 |  			if ($parameter['type'] === 'file') { | 
| 202 | 202 | $replacements[] = $parameter['path']; | 
| 203 | 203 |  			} else { | 
| @@ -138,7 +138,7 @@ discard block | ||
| 138 | 138 | } | 
| 139 | 139 |  		foreach ($favorites['folders'] as $favorite) { | 
| 140 | 140 |  			$limitations[] = $query->expr()->like('file', $query->createNamedParameter( | 
| 141 | - $this->db->escapeLikeParameter($favorite . '/') . '%' | |
| 141 | + $this->db->escapeLikeParameter($favorite.'/').'%' | |
| 142 | 142 | )); | 
| 143 | 143 | } | 
| 144 | 144 | |
| @@ -148,9 +148,9 @@ discard block | ||
| 148 | 148 | |
| 149 | 149 |  		$function = $query->createFunction(' | 
| 150 | 150 | CASE | 
| 151 | -				WHEN ' . $query->getColumnName('app') . ' <> ' . $query->createNamedParameter('files') . ' THEN 1 | |
| 152 | -				WHEN ' . $query->getColumnName('app') . ' = ' . $query->createNamedParameter('files') . ' | |
| 153 | -					AND (' . implode(' OR ', $limitations) . ') | |
| 151 | +				WHEN ' . $query->getColumnName('app').' <> '.$query->createNamedParameter('files').' THEN 1 | |
| 152 | +				WHEN ' . $query->getColumnName('app').' = '.$query->createNamedParameter('files').' | |
| 153 | +					AND (' . implode(' OR ', $limitations).') | |
| 154 | 154 | THEN 1 | 
| 155 | 155 | END = 1' | 
| 156 | 156 | ); | 
| @@ -64,7 +64,7 @@ | ||
| 64 | 64 |  			if (!empty($nodes)) { | 
| 65 | 65 | /** @var \OCP\Files\Node $node */ | 
| 66 | 66 | $node = array_shift($nodes); | 
| 67 | - $path = substr($node->getPath(), strlen($user . '/files/')); | |
| 67 | + $path = substr($node->getPath(), strlen($user.'/files/')); | |
| 68 | 68 | |
| 69 | 69 | $items[] = $path; | 
| 70 | 70 |  				if ($node instanceof Folder) { | 
| @@ -106,7 +106,7 @@ discard block | ||
| 106 | 106 | * @return DataResponse|FileDisplayResponse | 
| 107 | 107 | */ | 
| 108 | 108 |  	public function getThumbnail($x, $y, $file) { | 
| 109 | -		if($x < 1 || $y < 1) { | |
| 109 | +		if ($x < 1 || $y < 1) { | |
| 110 | 110 | return new DataResponse(['message' => 'Requested size must be numeric and a positive value.'], Http::STATUS_BAD_REQUEST); | 
| 111 | 111 | } | 
| 112 | 112 | |
| @@ -167,13 +167,13 @@ discard block | ||
| 167 | 167 | * @return array | 
| 168 | 168 | */ | 
| 169 | 169 |  	private function formatNodes(array $nodes) { | 
| 170 | -		return array_values(array_map(function (Node $node) { | |
| 170 | +		return array_values(array_map(function(Node $node) { | |
| 171 | 171 | /** @var \OC\Files\Node\Node $shareTypes */ | 
| 172 | 172 | $shareTypes = $this->getShareTypes($node); | 
| 173 | 173 | $file = \OCA\Files\Helper::formatFileInfo($node->getFileInfo()); | 
| 174 | 174 |  			$parts = explode('/', dirname($node->getPath()), 4); | 
| 175 | 175 |  			if (isset($parts[3])) { | 
| 176 | - $file['path'] = '/' . $parts[3]; | |
| 176 | + $file['path'] = '/'.$parts[3]; | |
| 177 | 177 |  			} else { | 
| 178 | 178 | $file['path'] = '/'; | 
| 179 | 179 | } | 
| @@ -31,7 +31,7 @@ discard block | ||
| 31 | 31 | use OCA\Files\Controller\ViewController; | 
| 32 | 32 | |
| 33 | 33 |  class Application extends App { | 
| 34 | -	public function __construct(array $urlParams=array()) { | |
| 34 | +	public function __construct(array $urlParams = array()) { | |
| 35 | 35 |  		parent::__construct('files', $urlParams); | 
| 36 | 36 | $container = $this->getContainer(); | 
| 37 | 37 | $server = $container->getServer(); | 
| @@ -39,7 +39,7 @@ discard block | ||
| 39 | 39 | /** | 
| 40 | 40 | * Controllers | 
| 41 | 41 | */ | 
| 42 | -		$container->registerService('APIController', function (IContainer $c) use ($server) { | |
| 42 | +		$container->registerService('APIController', function(IContainer $c) use ($server) { | |
| 43 | 43 | return new ApiController( | 
| 44 | 44 |  				$c->query('AppName'), | 
| 45 | 45 |  				$c->query('Request'), | 
| @@ -52,7 +52,7 @@ discard block | ||
| 52 | 52 | ); | 
| 53 | 53 | }); | 
| 54 | 54 | |
| 55 | -		$container->registerService('ViewController', function (IContainer $c) use ($server) { | |
| 55 | +		$container->registerService('ViewController', function(IContainer $c) use ($server) { | |
| 56 | 56 | return new ViewController( | 
| 57 | 57 |  				$c->query('AppName'), | 
| 58 | 58 |  				$c->query('Request'), | 
| @@ -76,10 +76,10 @@ discard block | ||
| 76 | 76 | /** | 
| 77 | 77 | * Services | 
| 78 | 78 | */ | 
| 79 | -		$container->registerService('Tagger', function(IContainer $c)  { | |
| 79 | +		$container->registerService('Tagger', function(IContainer $c) { | |
| 80 | 80 |  			return $c->query('ServerContainer')->getTagManager()->load('files'); | 
| 81 | 81 | }); | 
| 82 | -		$container->registerService('TagService', function(IContainer $c)  { | |
| 82 | +		$container->registerService('TagService', function(IContainer $c) { | |
| 83 | 83 |  			$homeFolder = $c->query('ServerContainer')->getUserFolder(); | 
| 84 | 84 | return new TagService( | 
| 85 | 85 |  				$c->query('ServerContainer')->getUserSession(), | 
| @@ -54,7 +54,7 @@ discard block | ||
| 54 | 54 | 'uploadMaxFilesize' => $maxUploadFileSize, | 
| 55 | 55 | 'maxHumanFilesize' => $maxHumanFileSize, | 
| 56 | 56 | 'freeSpace' => $storageInfo['free'], | 
| 57 | - 'usedSpacePercent' => (int)$storageInfo['relative'], | |
| 57 | + 'usedSpacePercent' => (int) $storageInfo['relative'], | |
| 58 | 58 | 'owner' => $storageInfo['owner'], | 
| 59 | 59 | 'ownerDisplayName' => $storageInfo['ownerDisplayName'], | 
| 60 | 60 | ]; | 
| @@ -67,7 +67,7 @@ discard block | ||
| 67 | 67 | * @return string icon URL | 
| 68 | 68 | */ | 
| 69 | 69 |  	public static function determineIcon($file) { | 
| 70 | -		if($file['type'] === 'dir') { | |
| 70 | +		if ($file['type'] === 'dir') { | |
| 71 | 71 |  			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir'); | 
| 72 | 72 | // TODO: move this part to the client side, using mountType | 
| 73 | 73 |  			if ($file->isShared()) { | 
| @@ -75,11 +75,11 @@ discard block | ||
| 75 | 75 |  			} elseif ($file->isMounted()) { | 
| 76 | 76 |  				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external'); | 
| 77 | 77 | } | 
| 78 | -		}else{ | |
| 78 | +		} else { | |
| 79 | 79 | $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype()); | 
| 80 | 80 | } | 
| 81 | 81 | |
| 82 | - return substr($icon, 0, -3) . 'svg'; | |
| 82 | + return substr($icon, 0, -3).'svg'; | |
| 83 | 83 | } | 
| 84 | 84 | |
| 85 | 85 | /** |