Inspection of "Merge pull request #13485 from nextcloud/enh/js/bu..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 27f492...c31d31 )

by Roeland

created 2019-01-10 16:24 UTC

Status

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -143,7 +143,7 @@  discard block
 block discarded – undo
 		}
 
 		$result = $this->rootView->file_put_contents(
-			$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
+			$newRoot.'/'.Storage::KEY_STORAGE_MARKER,
 			'Nextcloud will detect this folder as key storage root only if this file exists'
 		);
 
@@ -162,10 +162,10 @@  discard block
 block discarded – undo
 	 */
 	protected function moveSystemKeys($oldRoot, $newRoot) {
 		if (
-			$this->rootView->is_dir($oldRoot . '/files_encryption') &&
-			$this->targetExists($newRoot . '/files_encryption') === false
+			$this->rootView->is_dir($oldRoot.'/files_encryption') &&
+			$this->targetExists($newRoot.'/files_encryption') === false
 		) {
-			$this->rootView->rename($oldRoot . '/files_encryption', $newRoot . '/files_encryption');
+			$this->rootView->rename($oldRoot.'/files_encryption', $newRoot.'/files_encryption');
 		}
 	}
 
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
 		$progress->start();
 
 
-		foreach($this->userManager->getBackends() as $backend) {
+		foreach ($this->userManager->getBackends() as $backend) {
 			$limit = 500;
 			$offset = 0;
 			do {
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
 					$this->moveUserEncryptionFolder($user, $oldRoot, $newRoot);
 				}
 				$offset += $limit;
-			} while(count($users) >= $limit);
+			} while (count($users) >= $limit);
 		}
 		$progress->finish();
 	}
@@ -222,13 +222,13 @@  discard block
 block discarded – undo
 
 		if ($this->userManager->userExists($user)) {
 
-			$source = $oldRoot . '/' . $user . '/files_encryption';
-			$target = $newRoot . '/' . $user . '/files_encryption';
+			$source = $oldRoot.'/'.$user.'/files_encryption';
+			$target = $newRoot.'/'.$user.'/files_encryption';
 			if (
 				$this->rootView->is_dir($source) &&
 				$this->targetExists($target) === false
 			) {
-				$this->prepareParentFolder($newRoot . '/' . $user);
+				$this->prepareParentFolder($newRoot.'/'.$user);
 				$this->rootView->rename($source, $target);
 			}
 		}
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
 			$sub_dirs = explode('/', ltrim($path, '/'));
 			$dir = '';
 			foreach ($sub_dirs as $sub_dir) {
-				$dir .= '/' . $sub_dir;
+				$dir .= '/'.$sub_dir;
 				if ($this->rootView->file_exists($dir) === false) {
 					$this->rootView->mkdir($dir);
 				}

Please login to merge, or discard this patch.

lib/private/SubAdmin.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -120,9 +120,9 @@  discard block
 block discarded – undo
 			->execute();
 
 		$groups = [];
-		while($row = $result->fetch()) {
+		while ($row = $result->fetch()) {
 			$group = $this->groupManager->get($row['gid']);
-			if(!is_null($group)) {
+			if (!is_null($group)) {
 				$groups[$group->getGID()] = $group;
 			}
 		}
@@ -156,9 +156,9 @@  discard block
 block discarded – undo
 			->execute();
 
 		$users = [];
-		while($row = $result->fetch()) {
+		while ($row = $result->fetch()) {
 			$user = $this->userManager->get($row['uid']);
-			if(!is_null($user)) {
+			if (!is_null($user)) {
 				$users[] = $user;
 			}
 		}
@@ -179,10 +179,10 @@  discard block
 block discarded – undo
 			->execute();
 
 		$subadmins = [];
-		while($row = $result->fetch()) {
+		while ($row = $result->fetch()) {
 			$user = $this->userManager->get($row['uid']);
 			$group = $this->groupManager->get($row['gid']);
-			if(!is_null($user) && !is_null($group)) {
+			if (!is_null($user) && !is_null($group)) {
 				$subadmins[] = [
 					'user'  => $user,
 					'group' => $group
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
 			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
 			->execute();
 
-		$fetch =  $result->fetch();
+		$fetch = $result->fetch();
 		$result->closeCursor();
 		$result = !empty($fetch) ? true : false;
 
@@ -251,15 +251,15 @@  discard block
 block discarded – undo
 	 * @return bool
 	 */
 	public function isUserAccessible($subadmin, $user) {
-		if(!$this->isSubAdmin($subadmin)) {
+		if (!$this->isSubAdmin($subadmin)) {
 			return false;
 		}
-		if($this->groupManager->isAdmin($user->getUID())) {
+		if ($this->groupManager->isAdmin($user->getUID())) {
 			return false;
 		}
 		$accessibleGroups = $this->getSubAdminsGroups($subadmin);
-		foreach($accessibleGroups as $accessibleGroup) {
-			if($accessibleGroup->inGroup($user)) {
+		foreach ($accessibleGroups as $accessibleGroup) {
+			if ($accessibleGroup->inGroup($user)) {
 				return true;
 			}
 		}

Please login to merge, or discard this patch.

apps/user_ldap/lib/Proxy.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -49,7 +49,7 @@  discard block
 block discarded – undo
 	public function __construct(ILDAPWrapper $ldap) {
 		$this->ldap = $ldap;
 		$memcache = \OC::$server->getMemCacheFactory();
-		if($memcache->isAvailable()) {
+		if ($memcache->isAvailable()) {
 			$this->cache = $memcache->createDistributed();
 		}
 	}
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
 		static $db;
 		static $coreUserManager;
 		static $coreNotificationManager;
-		if($fs === null) {
+		if ($fs === null) {
 			$ocConfig = \OC::$server->getConfig();
 			$fs       = new FilesystemHelper();
 			$log      = new LogWrapper();
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
 	 * @return mixed
 	 */
 	protected function getAccess($configPrefix) {
-		if(!isset(self::$accesses[$configPrefix])) {
+		if (!isset(self::$accesses[$configPrefix])) {
 			$this->addAccess($configPrefix);
 		}
 		return self::$accesses[$configPrefix];
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
 	 * @return mixed, the result of the specified method
 	 */
 	protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
-		$result = $this->callOnLastSeenOn($id,  $method, $parameters, $passOnWhen);
-		if($result === $passOnWhen) {
+		$result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
+		if ($result === $passOnWhen) {
 			$result = $this->walkBackends($id, $method, $parameters);
 		}
 		return $result;
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
 	 */
 	private function getCacheKey($key) {
 		$prefix = 'LDAP-Proxy-';
-		if($key === null) {
+		if ($key === null) {
 			return $prefix;
 		}
 		return $prefix.hash('sha256', $key);
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
 	 * @return mixed|null
 	 */
 	public function getFromCache($key) {
-		if($this->cache === null) {
+		if ($this->cache === null) {
 			return null;
 		}
 
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
 	 * @param mixed $value
 	 */
 	public function writeToCache($key, $value) {
-		if($this->cache === null) {
+		if ($this->cache === null) {
 			return;
 		}
 		$key   = $this->getCacheKey($key);
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
 	}
 
 	public function clearCache() {
-		if($this->cache === null) {
+		if ($this->cache === null) {
 			return;
 		}
 		$this->cache->clear($this->getCacheKey(null));

Please login to merge, or discard this patch.

apps/dav/lib/Upload/ChunkingPlugin.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -100,7 +100,7 @@
 block discarded – undo
 
 		// casted to string because cast to float cause equality for non equal numbers
 		// and integer has the problem of limited size on 32 bit systems
-		if ((string)$expectedSize !== (string)$actualSize) {
+		if ((string) $expectedSize !== (string) $actualSize) {
 			throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes");
 		}
 	}

Please login to merge, or discard this patch.

lib/private/Template/JSCombiner.php 1 patch

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -69,7 +69,7 @@  discard block
 block discarded – undo
 		$this->appData = $appData;
 		$this->urlGenerator = $urlGenerator;
 		$this->cacheFactory = $cacheFactory;
-		$this->depsCache = $this->cacheFactory->createDistributed('JS-' . md5($this->urlGenerator->getBaseUrl()));
+		$this->depsCache = $this->cacheFactory->createDistributed('JS-'.md5($this->urlGenerator->getBaseUrl()));
 		$this->config = $config;
 		$this->logger = $logger;
 	}
@@ -85,19 +85,19 @@  discard block
 block discarded – undo
 			return false;
 		}
 
-		$path = explode('/', $root . '/' . $file);
+		$path = explode('/', $root.'/'.$file);
 
 		$fileName = array_pop($path);
 		$path = implode('/', $path);
 
 		try {
 			$folder = $this->appData->getFolder($app);
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			// creating css appdata folder
 			$folder = $this->appData->newFolder($app);
 		}
 
-		if($this->isCached($fileName, $folder)) {
+		if ($this->isCached($fileName, $folder)) {
 			return true;
 		}
 		return $this->cache($path, $fileName, $folder);
@@ -115,9 +115,9 @@  discard block
 block discarded – undo
 			return false;
 		}
 
-		$fileName = $fileName . '.deps';
+		$fileName = $fileName.'.deps';
 		try {
-			$deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
+			$deps = $this->depsCache->get($folder->getName().'-'.$fileName);
 			if ($deps === null || $deps === '') {
 				$depFile = $folder->getFile($fileName);
 				$deps = $depFile->getContent();
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
 
 			// check again
 			if ($deps === null || $deps === '') {
-				$this->logger->info('JSCombiner: deps file empty: ' . $fileName);
+				$this->logger->info('JSCombiner: deps file empty: '.$fileName);
 				return false;
 			}
 
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
 			}
 
 			return true;
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			return false;
 		}
 	}
@@ -155,17 +155,17 @@  discard block
 block discarded – undo
 	 */
 	protected function cache($path, $fileName, ISimpleFolder $folder) {
 		$deps = [];
-		$fullPath = $path . '/' . $fileName;
+		$fullPath = $path.'/'.$fileName;
 		$data = json_decode(file_get_contents($fullPath));
 		$deps[$fullPath] = filemtime($fullPath);
 
 		$res = '';
 		foreach ($data as $file) {
-			$filePath = $path . '/' . $file;
+			$filePath = $path.'/'.$file;
 
 			if (is_file($filePath)) {
 				$res .= file_get_contents($filePath);
-				$res .= PHP_EOL . PHP_EOL;
+				$res .= PHP_EOL.PHP_EOL;
 				$deps[$filePath] = filemtime($filePath);
 			}
 		}
@@ -173,11 +173,11 @@  discard block
 block discarded – undo
 		$fileName = str_replace('.json', '.js', $fileName);
 		try {
 			$cachedfile = $folder->getFile($fileName);
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			$cachedfile = $folder->newFile($fileName);
 		}
 
-		$depFileName = $fileName . '.deps';
+		$depFileName = $fileName.'.deps';
 		try {
 			$depFile = $folder->getFile($depFileName);
 		} catch (NotFoundException $e) {
@@ -185,21 +185,21 @@  discard block
 block discarded – undo
 		}
 
 		try {
-			$gzipFile = $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
+			$gzipFile = $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz
 		} catch (NotFoundException $e) {
-			$gzipFile = $folder->newFile($fileName . '.gzip'); # Safari doesn't like .gz
+			$gzipFile = $folder->newFile($fileName.'.gzip'); # Safari doesn't like .gz
 		}
 
 		try {
 			$cachedfile->putContent($res);
 			$deps = json_encode($deps);
 			$depFile->putContent($deps);
-			$this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
+			$this->depsCache->set($folder->getName().'-'.$depFileName, $deps);
 			$gzipFile->putContent(gzencode($res, 9));
-			$this->logger->debug('JSCombiner: successfully cached: ' . $fileName);
+			$this->logger->debug('JSCombiner: successfully cached: '.$fileName);
 			return true;
 		} catch (NotPermittedException $e) {
-			$this->logger->error('JSCombiner: unable to cache: ' . $fileName);
+			$this->logger->error('JSCombiner: unable to cache: '.$fileName);
 			return false;
 		}
 	}
@@ -224,8 +224,8 @@  discard block
 block discarded – undo
 	 */
 	public function getContent($root, $file) {
 		/** @var array $data */
-		$data = json_decode(file_get_contents($root . '/' . $file));
-		if(!is_array($data)) {
+		$data = json_decode(file_get_contents($root.'/'.$file));
+		if (!is_array($data)) {
 			return [];
 		}
 
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
 
 		$result = [];
 		foreach ($data as $f) {
-			$result[] = $path . '/' . $f;
+			$result[] = $path.'/'.$f;
 		}
 
 		return $result;

Please login to merge, or discard this patch.

lib/private/legacy/eventsource.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -60,7 +60,7 @@  discard block
 block discarded – undo
 		header('X-Accel-Buffering: no');
 		$this->fallback = isset($_GET['fallback']) and $_GET['fallback'] == 'true';
 		if ($this->fallback) {
-			$this->fallBackId = (int)$_GET['fallback_id'];
+			$this->fallBackId = (int) $_GET['fallback_id'];
 			/**
 			 * FIXME: The default content-security-policy of ownCloud forbids inline
 			 * JavaScript for security reasons. IE starting on Windows 10 will
@@ -73,11 +73,11 @@  discard block
 block discarded – undo
 			 */
 			header("Content-Security-Policy: default-src 'none'; script-src 'unsafe-inline'");
 			header("Content-Type: text/html");
-			echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy
+			echo str_repeat('<span></span>'.PHP_EOL, 10); //dummy data to keep IE happy
 		} else {
 			header("Content-Type: text/event-stream");
 		}
-		if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
+		if (!\OC::$server->getRequest()->passesStrictCookieCheck()) {
 			header('Location: '.\OC::$WEBROOT);
 			exit();
 		}
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
 	 */
 	public function send($type, $data = null) {
 		if ($data and !preg_match('/^[A-Za-z0-9_]+$/', $type)) {
-			throw new BadMethodCallException('Type needs to be alphanumeric ('. $type .')');
+			throw new BadMethodCallException('Type needs to be alphanumeric ('.$type.')');
 		}
 		$this->init();
 		if (is_null($data)) {
@@ -110,13 +110,13 @@  discard block
 block discarded – undo
 		}
 		if ($this->fallback) {
 			$response = '<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('
-				. $this->fallBackId . ',"' . $type . '",' . OC_JSON::encode($data) . ')</script>' . PHP_EOL;
+				. $this->fallBackId.',"'.$type.'",'.OC_JSON::encode($data).')</script>'.PHP_EOL;
 			echo $response;
 		} else {
 			if ($type) {
-				echo 'event: ' . $type . PHP_EOL;
+				echo 'event: '.$type.PHP_EOL;
 			}
-			echo 'data: ' . OC_JSON::encode($data) . PHP_EOL;
+			echo 'data: '.OC_JSON::encode($data).PHP_EOL;
 		}
 		echo PHP_EOL;
 		flush();

Please login to merge, or discard this patch.

apps/files/composer/composer/autoload_classmap.php 1 patch

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -6,32 +6,32 @@
 block discarded – undo
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir . '/../lib/Activity/FavoriteProvider.php',
-    'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir . '/../lib/Activity/Filter/Favorites.php',
-    'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir . '/../lib/Activity/Filter/FileChanges.php',
-    'OCA\\Files\\Activity\\Helper' => $baseDir . '/../lib/Activity/Helper.php',
-    'OCA\\Files\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
-    'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir . '/../lib/Activity/Settings/FavoriteAction.php',
-    'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
-    'OCA\\Files\\Activity\\Settings\\FileCreated' => $baseDir . '/../lib/Activity/Settings/FileCreated.php',
-    'OCA\\Files\\Activity\\Settings\\FileDeleted' => $baseDir . '/../lib/Activity/Settings/FileDeleted.php',
-    'OCA\\Files\\Activity\\Settings\\FileFavorite' => $baseDir . '/../lib/Activity/Settings/FileFavorite.php',
-    'OCA\\Files\\Activity\\Settings\\FileRestored' => $baseDir . '/../lib/Activity/Settings/FileRestored.php',
-    'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
-    'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir . '/../lib/BackgroundJob/CleanupFileLocks.php',
-    'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
-    'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir . '/../lib/BackgroundJob/ScanFiles.php',
-    'OCA\\Files\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
-    'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir . '/../lib/Command/DeleteOrphanedFiles.php',
-    'OCA\\Files\\Command\\Scan' => $baseDir . '/../lib/Command/Scan.php',
-    'OCA\\Files\\Command\\ScanAppData' => $baseDir . '/../lib/Command/ScanAppData.php',
-    'OCA\\Files\\Command\\TransferOwnership' => $baseDir . '/../lib/Command/TransferOwnership.php',
-    'OCA\\Files\\Controller\\AjaxController' => $baseDir . '/../lib/Controller/AjaxController.php',
-    'OCA\\Files\\Controller\\ApiController' => $baseDir . '/../lib/Controller/ApiController.php',
-    'OCA\\Files\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
-    'OCA\\Files\\Controller\\ViewController' => $baseDir . '/../lib/Controller/ViewController.php',
-    'OCA\\Files\\Helper' => $baseDir . '/../lib/Helper.php',
-    'OCA\\Files\\Service\\TagService' => $baseDir . '/../lib/Service/TagService.php',
-    'OCA\\Files\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
+    'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir.'/../lib/Activity/FavoriteProvider.php',
+    'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir.'/../lib/Activity/Filter/Favorites.php',
+    'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir.'/../lib/Activity/Filter/FileChanges.php',
+    'OCA\\Files\\Activity\\Helper' => $baseDir.'/../lib/Activity/Helper.php',
+    'OCA\\Files\\Activity\\Provider' => $baseDir.'/../lib/Activity/Provider.php',
+    'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir.'/../lib/Activity/Settings/FavoriteAction.php',
+    'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir.'/../lib/Activity/Settings/FileChanged.php',
+    'OCA\\Files\\Activity\\Settings\\FileCreated' => $baseDir.'/../lib/Activity/Settings/FileCreated.php',
+    'OCA\\Files\\Activity\\Settings\\FileDeleted' => $baseDir.'/../lib/Activity/Settings/FileDeleted.php',
+    'OCA\\Files\\Activity\\Settings\\FileFavorite' => $baseDir.'/../lib/Activity/Settings/FileFavorite.php',
+    'OCA\\Files\\Activity\\Settings\\FileRestored' => $baseDir.'/../lib/Activity/Settings/FileRestored.php',
+    'OCA\\Files\\App' => $baseDir.'/../lib/App.php',
+    'OCA\\Files\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir.'/../lib/BackgroundJob/CleanupFileLocks.php',
+    'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir.'/../lib/BackgroundJob/DeleteOrphanedItems.php',
+    'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir.'/../lib/BackgroundJob/ScanFiles.php',
+    'OCA\\Files\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
+    'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir.'/../lib/Command/DeleteOrphanedFiles.php',
+    'OCA\\Files\\Command\\Scan' => $baseDir.'/../lib/Command/Scan.php',
+    'OCA\\Files\\Command\\ScanAppData' => $baseDir.'/../lib/Command/ScanAppData.php',
+    'OCA\\Files\\Command\\TransferOwnership' => $baseDir.'/../lib/Command/TransferOwnership.php',
+    'OCA\\Files\\Controller\\AjaxController' => $baseDir.'/../lib/Controller/AjaxController.php',
+    'OCA\\Files\\Controller\\ApiController' => $baseDir.'/../lib/Controller/ApiController.php',
+    'OCA\\Files\\Controller\\SettingsController' => $baseDir.'/../lib/Controller/SettingsController.php',
+    'OCA\\Files\\Controller\\ViewController' => $baseDir.'/../lib/Controller/ViewController.php',
+    'OCA\\Files\\Helper' => $baseDir.'/../lib/Helper.php',
+    'OCA\\Files\\Service\\TagService' => $baseDir.'/../lib/Service/TagService.php',
+    'OCA\\Files\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
 );

Please login to merge, or discard this patch.

apps/files/composer/composer/autoload_static.php 1 patch

Spacing +35 added lines, -35 removed lines patch added patch discarded remove patch

@@ -6,54 +6,54 @@
 block discarded – undo
 
 class ComposerStaticInitFiles
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Files\\' => 10,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Files\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__ . '/..' . '/../lib/Activity/FavoriteProvider.php',
-        'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__ . '/..' . '/../lib/Activity/Filter/Favorites.php',
-        'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__ . '/..' . '/../lib/Activity/Filter/FileChanges.php',
-        'OCA\\Files\\Activity\\Helper' => __DIR__ . '/..' . '/../lib/Activity/Helper.php',
-        'OCA\\Files\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
-        'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__ . '/..' . '/../lib/Activity/Settings/FavoriteAction.php',
-        'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
-        'OCA\\Files\\Activity\\Settings\\FileCreated' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileCreated.php',
-        'OCA\\Files\\Activity\\Settings\\FileDeleted' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileDeleted.php',
-        'OCA\\Files\\Activity\\Settings\\FileFavorite' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavorite.php',
-        'OCA\\Files\\Activity\\Settings\\FileRestored' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileRestored.php',
-        'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
-        'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupFileLocks.php',
-        'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__ . '/..' . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
-        'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__ . '/..' . '/../lib/BackgroundJob/ScanFiles.php',
-        'OCA\\Files\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
-        'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__ . '/..' . '/../lib/Command/DeleteOrphanedFiles.php',
-        'OCA\\Files\\Command\\Scan' => __DIR__ . '/..' . '/../lib/Command/Scan.php',
-        'OCA\\Files\\Command\\ScanAppData' => __DIR__ . '/..' . '/../lib/Command/ScanAppData.php',
-        'OCA\\Files\\Command\\TransferOwnership' => __DIR__ . '/..' . '/../lib/Command/TransferOwnership.php',
-        'OCA\\Files\\Controller\\AjaxController' => __DIR__ . '/..' . '/../lib/Controller/AjaxController.php',
-        'OCA\\Files\\Controller\\ApiController' => __DIR__ . '/..' . '/../lib/Controller/ApiController.php',
-        'OCA\\Files\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
-        'OCA\\Files\\Controller\\ViewController' => __DIR__ . '/..' . '/../lib/Controller/ViewController.php',
-        'OCA\\Files\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
-        'OCA\\Files\\Service\\TagService' => __DIR__ . '/..' . '/../lib/Service/TagService.php',
-        'OCA\\Files\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
+    public static $classMap = array(
+        'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__.'/..'.'/../lib/Activity/FavoriteProvider.php',
+        'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__.'/..'.'/../lib/Activity/Filter/Favorites.php',
+        'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__.'/..'.'/../lib/Activity/Filter/FileChanges.php',
+        'OCA\\Files\\Activity\\Helper' => __DIR__.'/..'.'/../lib/Activity/Helper.php',
+        'OCA\\Files\\Activity\\Provider' => __DIR__.'/..'.'/../lib/Activity/Provider.php',
+        'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__.'/..'.'/../lib/Activity/Settings/FavoriteAction.php',
+        'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__.'/..'.'/../lib/Activity/Settings/FileChanged.php',
+        'OCA\\Files\\Activity\\Settings\\FileCreated' => __DIR__.'/..'.'/../lib/Activity/Settings/FileCreated.php',
+        'OCA\\Files\\Activity\\Settings\\FileDeleted' => __DIR__.'/..'.'/../lib/Activity/Settings/FileDeleted.php',
+        'OCA\\Files\\Activity\\Settings\\FileFavorite' => __DIR__.'/..'.'/../lib/Activity/Settings/FileFavorite.php',
+        'OCA\\Files\\Activity\\Settings\\FileRestored' => __DIR__.'/..'.'/../lib/Activity/Settings/FileRestored.php',
+        'OCA\\Files\\App' => __DIR__.'/..'.'/../lib/App.php',
+        'OCA\\Files\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__.'/..'.'/../lib/BackgroundJob/CleanupFileLocks.php',
+        'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__.'/..'.'/../lib/BackgroundJob/DeleteOrphanedItems.php',
+        'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__.'/..'.'/../lib/BackgroundJob/ScanFiles.php',
+        'OCA\\Files\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
+        'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__.'/..'.'/../lib/Command/DeleteOrphanedFiles.php',
+        'OCA\\Files\\Command\\Scan' => __DIR__.'/..'.'/../lib/Command/Scan.php',
+        'OCA\\Files\\Command\\ScanAppData' => __DIR__.'/..'.'/../lib/Command/ScanAppData.php',
+        'OCA\\Files\\Command\\TransferOwnership' => __DIR__.'/..'.'/../lib/Command/TransferOwnership.php',
+        'OCA\\Files\\Controller\\AjaxController' => __DIR__.'/..'.'/../lib/Controller/AjaxController.php',
+        'OCA\\Files\\Controller\\ApiController' => __DIR__.'/..'.'/../lib/Controller/ApiController.php',
+        'OCA\\Files\\Controller\\SettingsController' => __DIR__.'/..'.'/../lib/Controller/SettingsController.php',
+        'OCA\\Files\\Controller\\ViewController' => __DIR__.'/..'.'/../lib/Controller/ViewController.php',
+        'OCA\\Files\\Helper' => __DIR__.'/..'.'/../lib/Helper.php',
+        'OCA\\Files\\Service\\TagService' => __DIR__.'/..'.'/../lib/Service/TagService.php',
+        'OCA\\Files\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitFiles::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitFiles::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitFiles::$classMap;

Please login to merge, or discard this patch.

apps/files/ajax/list.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -32,7 +32,7 @@  discard block
 block discarded – undo
 $l = \OC::$server->getL10N('files');
 
 // Load the files
-$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
+$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : '';
 $dir = \OC\Files\Filesystem::normalizePath($dir);
 
 try {
@@ -43,11 +43,11 @@  discard block
 block discarded – undo
 	}
 
 	$data = array();
-	$baseUrl = \OC::$server->getURLGenerator()->linkTo('files', 'index.php') . '?dir=';
+	$baseUrl = \OC::$server->getURLGenerator()->linkTo('files', 'index.php').'?dir=';
 
 	$permissions = $dirInfo->getPermissions();
 
-	$sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
+	$sortAttribute = isset($_GET['sort']) ? (string) $_GET['sort'] : 'name';
 	$sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
 	$mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : '';
 

Please login to merge, or discard this patch.

		@@ -143,7 +143,7 @@ discard block
		block discarded – undo
143	143	}
144	144
145	145	$result = $this->rootView->file_put_contents(
146		- $newRoot . '/' . Storage::KEY_STORAGE_MARKER,
	146	+ $newRoot.'/'.Storage::KEY_STORAGE_MARKER,
147	147	'Nextcloud will detect this folder as key storage root only if this file exists'
148	148	);
149	149
		@@ -162,10 +162,10 @@ discard block
		block discarded – undo
162	162	*/
163	163	protected function moveSystemKeys($oldRoot, $newRoot) {
164	164	if (
165		- $this->rootView->is_dir($oldRoot . '/files_encryption') &&
166		- $this->targetExists($newRoot . '/files_encryption') === false
	165	+ $this->rootView->is_dir($oldRoot.'/files_encryption') &&
	166	+ $this->targetExists($newRoot.'/files_encryption') === false
167	167	) {
168		- $this->rootView->rename($oldRoot . '/files_encryption', $newRoot . '/files_encryption');
	168	+ $this->rootView->rename($oldRoot.'/files_encryption', $newRoot.'/files_encryption');
169	169	}
170	170	}
171	171
		@@ -194,7 +194,7 @@ discard block
		block discarded – undo
194	194	$progress->start();
195	195
196	196
197		- foreach($this->userManager->getBackends() as $backend) {
	197	+ foreach ($this->userManager->getBackends() as $backend) {
198	198	$limit = 500;
199	199	$offset = 0;
200	200	do {
		@@ -205,7 +205,7 @@ discard block
		block discarded – undo
205	205	$this->moveUserEncryptionFolder($user, $oldRoot, $newRoot);
206	206	}
207	207	$offset += $limit;
208		- } while(count($users) >= $limit);
	208	+ } while (count($users) >= $limit);
209	209	}
210	210	$progress->finish();
211	211	}
		@@ -222,13 +222,13 @@ discard block
		block discarded – undo
222	222
223	223	if ($this->userManager->userExists($user)) {
224	224
225		- $source = $oldRoot . '/' . $user . '/files_encryption';
226		- $target = $newRoot . '/' . $user . '/files_encryption';
	225	+ $source = $oldRoot.'/'.$user.'/files_encryption';
	226	+ $target = $newRoot.'/'.$user.'/files_encryption';
227	227	if (
228	228	$this->rootView->is_dir($source) &&
229	229	$this->targetExists($target) === false
230	230	) {
231		- $this->prepareParentFolder($newRoot . '/' . $user);
	231	+ $this->prepareParentFolder($newRoot.'/'.$user);
232	232	$this->rootView->rename($source, $target);
233	233	}
234	234	}
		@@ -246,7 +246,7 @@ discard block
		block discarded – undo
246	246	$sub_dirs = explode('/', ltrim($path, '/'));
247	247	$dir = '';
248	248	foreach ($sub_dirs as $sub_dir) {
249		- $dir .= '/' . $sub_dir;
	249	+ $dir .= '/'.$sub_dir;
250	250	if ($this->rootView->file_exists($dir) === false) {
251	251	$this->rootView->mkdir($dir);
252	252	}

		@@ -120,9 +120,9 @@ discard block
		block discarded – undo
120	120	->execute();
121	121
122	122	$groups = [];
123		- while($row = $result->fetch()) {
	123	+ while ($row = $result->fetch()) {
124	124	$group = $this->groupManager->get($row['gid']);
125		- if(!is_null($group)) {
	125	+ if (!is_null($group)) {
126	126	$groups[$group->getGID()] = $group;
127	127	}
128	128	}
		@@ -156,9 +156,9 @@ discard block
		block discarded – undo
156	156	->execute();
157	157
158	158	$users = [];
159		- while($row = $result->fetch()) {
	159	+ while ($row = $result->fetch()) {
160	160	$user = $this->userManager->get($row['uid']);
161		- if(!is_null($user)) {
	161	+ if (!is_null($user)) {
162	162	$users[] = $user;
163	163	}
164	164	}
		@@ -179,10 +179,10 @@ discard block
		block discarded – undo
179	179	->execute();
180	180
181	181	$subadmins = [];
182		- while($row = $result->fetch()) {
	182	+ while ($row = $result->fetch()) {
183	183	$user = $this->userManager->get($row['uid']);
184	184	$group = $this->groupManager->get($row['gid']);
185		- if(!is_null($user) && !is_null($group)) {
	185	+ if (!is_null($user) && !is_null($group)) {
186	186	$subadmins[] = [
187	187	'user' => $user,
188	188	'group' => $group
		@@ -212,7 +212,7 @@ discard block
		block discarded – undo
212	212	->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
213	213	->execute();
214	214
215		- $fetch = $result->fetch();
	215	+ $fetch = $result->fetch();
216	216	$result->closeCursor();
217	217	$result = !empty($fetch) ? true : false;
218	218
		@@ -251,15 +251,15 @@ discard block
		block discarded – undo
251	251	* @return bool
252	252	*/
253	253	public function isUserAccessible($subadmin, $user) {
254		- if(!$this->isSubAdmin($subadmin)) {
	254	+ if (!$this->isSubAdmin($subadmin)) {
255	255	return false;
256	256	}
257		- if($this->groupManager->isAdmin($user->getUID())) {
	257	+ if ($this->groupManager->isAdmin($user->getUID())) {
258	258	return false;
259	259	}
260	260	$accessibleGroups = $this->getSubAdminsGroups($subadmin);
261		- foreach($accessibleGroups as $accessibleGroup) {
262		- if($accessibleGroup->inGroup($user)) {
	261	+ foreach ($accessibleGroups as $accessibleGroup) {
	262	+ if ($accessibleGroup->inGroup($user)) {
263	263	return true;
264	264	}
265	265	}

		@@ -49,7 +49,7 @@ discard block
		block discarded – undo
49	49	public function __construct(ILDAPWrapper $ldap) {
50	50	$this->ldap = $ldap;
51	51	$memcache = \OC::$server->getMemCacheFactory();
52		- if($memcache->isAvailable()) {
	52	+ if ($memcache->isAvailable()) {
53	53	$this->cache = $memcache->createDistributed();
54	54	}
55	55	}
		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	static $db;
68	68	static $coreUserManager;
69	69	static $coreNotificationManager;
70		- if($fs === null) {
	70	+ if ($fs === null) {
71	71	$ocConfig = \OC::$server->getConfig();
72	72	$fs = new FilesystemHelper();
73	73	$log = new LogWrapper();
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93	* @return mixed
94	94	*/
95	95	protected function getAccess($configPrefix) {
96		- if(!isset(self::$accesses[$configPrefix])) {
	96	+ if (!isset(self::$accesses[$configPrefix])) {
97	97	$this->addAccess($configPrefix);
98	98	}
99	99	return self::$accesses[$configPrefix];
		@@ -147,8 +147,8 @@ discard block
		block discarded – undo
147	147	* @return mixed, the result of the specified method
148	148	*/
149	149	protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
150		- $result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
151		- if($result === $passOnWhen) {
	150	+ $result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
	151	+ if ($result === $passOnWhen) {
152	152	$result = $this->walkBackends($id, $method, $parameters);
153	153	}
154	154	return $result;
		@@ -160,7 +160,7 @@ discard block
		block discarded – undo
160	160	*/
161	161	private function getCacheKey($key) {
162	162	$prefix = 'LDAP-Proxy-';
163		- if($key === null) {
	163	+ if ($key === null) {
164	164	return $prefix;
165	165	}
166	166	return $prefix.hash('sha256', $key);
		@@ -171,7 +171,7 @@ discard block
		block discarded – undo
171	171	* @return mixed\|null
172	172	*/
173	173	public function getFromCache($key) {
174		- if($this->cache === null) {
	174	+ if ($this->cache === null) {
175	175	return null;
176	176	}
177	177
		@@ -189,7 +189,7 @@ discard block
		block discarded – undo
189	189	* @param mixed $value
190	190	*/
191	191	public function writeToCache($key, $value) {
192		- if($this->cache === null) {
	192	+ if ($this->cache === null) {
193	193	return;
194	194	}
195	195	$key = $this->getCacheKey($key);
		@@ -198,7 +198,7 @@ discard block
		block discarded – undo
198	198	}
199	199
200	200	public function clearCache() {
201		- if($this->cache === null) {
	201	+ if ($this->cache === null) {
202	202	return;
203	203	}
204	204	$this->cache->clear($this->getCacheKey(null));

		@@ -100,7 +100,7 @@
		block discarded – undo
100	100
101	101	// casted to string because cast to float cause equality for non equal numbers
102	102	// and integer has the problem of limited size on 32 bit systems
103		- if ((string)$expectedSize !== (string)$actualSize) {
	103	+ if ((string) $expectedSize !== (string) $actualSize) {
104	104	throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes");
105	105	}
106	106	}

		@@ -69,7 +69,7 @@ discard block
		block discarded – undo
69	69	$this->appData = $appData;
70	70	$this->urlGenerator = $urlGenerator;
71	71	$this->cacheFactory = $cacheFactory;
72		- $this->depsCache = $this->cacheFactory->createDistributed('JS-' . md5($this->urlGenerator->getBaseUrl()));
	72	+ $this->depsCache = $this->cacheFactory->createDistributed('JS-'.md5($this->urlGenerator->getBaseUrl()));
73	73	$this->config = $config;
74	74	$this->logger = $logger;
75	75	}
		@@ -85,19 +85,19 @@ discard block
		block discarded – undo
85	85	return false;
86	86	}
87	87
88		- $path = explode('/', $root . '/' . $file);
	88	+ $path = explode('/', $root.'/'.$file);
89	89
90	90	$fileName = array_pop($path);
91	91	$path = implode('/', $path);
92	92
93	93	try {
94	94	$folder = $this->appData->getFolder($app);
95		- } catch(NotFoundException $e) {
	95	+ } catch (NotFoundException $e) {
96	96	// creating css appdata folder
97	97	$folder = $this->appData->newFolder($app);
98	98	}
99	99
100		- if($this->isCached($fileName, $folder)) {
	100	+ if ($this->isCached($fileName, $folder)) {
101	101	return true;
102	102	}
103	103	return $this->cache($path, $fileName, $folder);
		@@ -115,9 +115,9 @@ discard block
		block discarded – undo
115	115	return false;
116	116	}
117	117
118		- $fileName = $fileName . '.deps';
	118	+ $fileName = $fileName.'.deps';
119	119	try {
120		- $deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
	120	+ $deps = $this->depsCache->get($folder->getName().'-'.$fileName);
121	121	if ($deps === null \|\| $deps === '') {
122	122	$depFile = $folder->getFile($fileName);
123	123	$deps = $depFile->getContent();
		@@ -125,7 +125,7 @@ discard block
		block discarded – undo
125	125
126	126	// check again
127	127	if ($deps === null \|\| $deps === '') {
128		- $this->logger->info('JSCombiner: deps file empty: ' . $fileName);
	128	+ $this->logger->info('JSCombiner: deps file empty: '.$fileName);
129	129	return false;
130	130	}
131	131
		@@ -142,7 +142,7 @@ discard block
		block discarded – undo
142	142	}
143	143
144	144	return true;
145		- } catch(NotFoundException $e) {
	145	+ } catch (NotFoundException $e) {
146	146	return false;
147	147	}
148	148	}
		@@ -155,17 +155,17 @@ discard block
		block discarded – undo
155	155	*/
156	156	protected function cache($path, $fileName, ISimpleFolder $folder) {
157	157	$deps = [];
158		- $fullPath = $path . '/' . $fileName;
	158	+ $fullPath = $path.'/'.$fileName;
159	159	$data = json_decode(file_get_contents($fullPath));
160	160	$deps[$fullPath] = filemtime($fullPath);
161	161
162	162	$res = '';
163	163	foreach ($data as $file) {
164		- $filePath = $path . '/' . $file;
	164	+ $filePath = $path.'/'.$file;
165	165
166	166	if (is_file($filePath)) {
167	167	$res .= file_get_contents($filePath);
168		- $res .= PHP_EOL . PHP_EOL;
	168	+ $res .= PHP_EOL.PHP_EOL;
169	169	$deps[$filePath] = filemtime($filePath);
170	170	}
171	171	}
		@@ -173,11 +173,11 @@ discard block
		block discarded – undo
173	173	$fileName = str_replace('.json', '.js', $fileName);
174	174	try {
175	175	$cachedfile = $folder->getFile($fileName);
176		- } catch(NotFoundException $e) {
	176	+ } catch (NotFoundException $e) {
177	177	$cachedfile = $folder->newFile($fileName);
178	178	}
179	179
180		- $depFileName = $fileName . '.deps';
	180	+ $depFileName = $fileName.'.deps';
181	181	try {
182	182	$depFile = $folder->getFile($depFileName);
183	183	} catch (NotFoundException $e) {
		@@ -185,21 +185,21 @@ discard block
		block discarded – undo
185	185	}
186	186
187	187	try {
188		- $gzipFile = $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
	188	+ $gzipFile = $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz
189	189	} catch (NotFoundException $e) {
190		- $gzipFile = $folder->newFile($fileName . '.gzip'); # Safari doesn't like .gz
	190	+ $gzipFile = $folder->newFile($fileName.'.gzip'); # Safari doesn't like .gz
191	191	}
192	192
193	193	try {
194	194	$cachedfile->putContent($res);
195	195	$deps = json_encode($deps);
196	196	$depFile->putContent($deps);
197		- $this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
	197	+ $this->depsCache->set($folder->getName().'-'.$depFileName, $deps);
198	198	$gzipFile->putContent(gzencode($res, 9));
199		- $this->logger->debug('JSCombiner: successfully cached: ' . $fileName);
	199	+ $this->logger->debug('JSCombiner: successfully cached: '.$fileName);
200	200	return true;
201	201	} catch (NotPermittedException $e) {
202		- $this->logger->error('JSCombiner: unable to cache: ' . $fileName);
	202	+ $this->logger->error('JSCombiner: unable to cache: '.$fileName);
203	203	return false;
204	204	}
205	205	}
		@@ -224,8 +224,8 @@ discard block
		block discarded – undo
224	224	*/
225	225	public function getContent($root, $file) {
226	226	/** @var array $data */
227		- $data = json_decode(file_get_contents($root . '/' . $file));
228		- if(!is_array($data)) {
	227	+ $data = json_decode(file_get_contents($root.'/'.$file));
	228	+ if (!is_array($data)) {
229	229	return [];
230	230	}
231	231
		@@ -235,7 +235,7 @@ discard block
		block discarded – undo
235	235
236	236	$result = [];
237	237	foreach ($data as $f) {
238		- $result[] = $path . '/' . $f;
	238	+ $result[] = $path.'/'.$f;
239	239	}
240	240
241	241	return $result;

		@@ -60,7 +60,7 @@ discard block
		block discarded – undo
60	60	header('X-Accel-Buffering: no');
61	61	$this->fallback = isset($_GET['fallback']) and $_GET['fallback'] == 'true';
62	62	if ($this->fallback) {
63		- $this->fallBackId = (int)$_GET['fallback_id'];
	63	+ $this->fallBackId = (int) $_GET['fallback_id'];
64	64	/**
65	65	* FIXME: The default content-security-policy of ownCloud forbids inline
66	66	* JavaScript for security reasons. IE starting on Windows 10 will
		@@ -73,11 +73,11 @@ discard block
		block discarded – undo
73	73	*/
74	74	header("Content-Security-Policy: default-src 'none'; script-src 'unsafe-inline'");
75	75	header("Content-Type: text/html");
76		- echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy
	76	+ echo str_repeat('<span></span>'.PHP_EOL, 10); //dummy data to keep IE happy
77	77	} else {
78	78	header("Content-Type: text/event-stream");
79	79	}
80		- if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
	80	+ if (!\OC::$server->getRequest()->passesStrictCookieCheck()) {
81	81	header('Location: '.\OC::$WEBROOT);
82	82	exit();
83	83	}
		@@ -101,7 +101,7 @@ discard block
		block discarded – undo
101	101	*/
102	102	public function send($type, $data = null) {
103	103	if ($data and !preg_match('/^[A-Za-z0-9_]+$/', $type)) {
104		- throw new BadMethodCallException('Type needs to be alphanumeric ('. $type .')');
	104	+ throw new BadMethodCallException('Type needs to be alphanumeric ('.$type.')');
105	105	}
106	106	$this->init();
107	107	if (is_null($data)) {
		@@ -110,13 +110,13 @@ discard block
		block discarded – undo
110	110	}
111	111	if ($this->fallback) {
112	112	$response = '<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('
113		- . $this->fallBackId . ',"' . $type . '",' . OC_JSON::encode($data) . ')</script>' . PHP_EOL;
	113	+ . $this->fallBackId.',"'.$type.'",'.OC_JSON::encode($data).')</script>'.PHP_EOL;
114	114	echo $response;
115	115	} else {
116	116	if ($type) {
117		- echo 'event: ' . $type . PHP_EOL;
	117	+ echo 'event: '.$type.PHP_EOL;
118	118	}
119		- echo 'data: ' . OC_JSON::encode($data) . PHP_EOL;
	119	+ echo 'data: '.OC_JSON::encode($data).PHP_EOL;
120	120	}
121	121	echo PHP_EOL;
122	122	flush();

		@@ -6,32 +6,32 @@
		block discarded – undo
6	6	$baseDir = $vendorDir;
7	7
8	8	return array(
9		- 'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir . '/../lib/Activity/FavoriteProvider.php',
10		- 'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir . '/../lib/Activity/Filter/Favorites.php',
11		- 'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir . '/../lib/Activity/Filter/FileChanges.php',
12		- 'OCA\\Files\\Activity\\Helper' => $baseDir . '/../lib/Activity/Helper.php',
13		- 'OCA\\Files\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
14		- 'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir . '/../lib/Activity/Settings/FavoriteAction.php',
15		- 'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
16		- 'OCA\\Files\\Activity\\Settings\\FileCreated' => $baseDir . '/../lib/Activity/Settings/FileCreated.php',
17		- 'OCA\\Files\\Activity\\Settings\\FileDeleted' => $baseDir . '/../lib/Activity/Settings/FileDeleted.php',
18		- 'OCA\\Files\\Activity\\Settings\\FileFavorite' => $baseDir . '/../lib/Activity/Settings/FileFavorite.php',
19		- 'OCA\\Files\\Activity\\Settings\\FileRestored' => $baseDir . '/../lib/Activity/Settings/FileRestored.php',
20		- 'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
21		- 'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
22		- 'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir . '/../lib/BackgroundJob/CleanupFileLocks.php',
23		- 'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
24		- 'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir . '/../lib/BackgroundJob/ScanFiles.php',
25		- 'OCA\\Files\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
26		- 'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir . '/../lib/Command/DeleteOrphanedFiles.php',
27		- 'OCA\\Files\\Command\\Scan' => $baseDir . '/../lib/Command/Scan.php',
28		- 'OCA\\Files\\Command\\ScanAppData' => $baseDir . '/../lib/Command/ScanAppData.php',
29		- 'OCA\\Files\\Command\\TransferOwnership' => $baseDir . '/../lib/Command/TransferOwnership.php',
30		- 'OCA\\Files\\Controller\\AjaxController' => $baseDir . '/../lib/Controller/AjaxController.php',
31		- 'OCA\\Files\\Controller\\ApiController' => $baseDir . '/../lib/Controller/ApiController.php',
32		- 'OCA\\Files\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
33		- 'OCA\\Files\\Controller\\ViewController' => $baseDir . '/../lib/Controller/ViewController.php',
34		- 'OCA\\Files\\Helper' => $baseDir . '/../lib/Helper.php',
35		- 'OCA\\Files\\Service\\TagService' => $baseDir . '/../lib/Service/TagService.php',
36		- 'OCA\\Files\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
	9	+ 'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir.'/../lib/Activity/FavoriteProvider.php',
	10	+ 'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir.'/../lib/Activity/Filter/Favorites.php',
	11	+ 'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir.'/../lib/Activity/Filter/FileChanges.php',
	12	+ 'OCA\\Files\\Activity\\Helper' => $baseDir.'/../lib/Activity/Helper.php',
	13	+ 'OCA\\Files\\Activity\\Provider' => $baseDir.'/../lib/Activity/Provider.php',
	14	+ 'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir.'/../lib/Activity/Settings/FavoriteAction.php',
	15	+ 'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir.'/../lib/Activity/Settings/FileChanged.php',
	16	+ 'OCA\\Files\\Activity\\Settings\\FileCreated' => $baseDir.'/../lib/Activity/Settings/FileCreated.php',
	17	+ 'OCA\\Files\\Activity\\Settings\\FileDeleted' => $baseDir.'/../lib/Activity/Settings/FileDeleted.php',
	18	+ 'OCA\\Files\\Activity\\Settings\\FileFavorite' => $baseDir.'/../lib/Activity/Settings/FileFavorite.php',
	19	+ 'OCA\\Files\\Activity\\Settings\\FileRestored' => $baseDir.'/../lib/Activity/Settings/FileRestored.php',
	20	+ 'OCA\\Files\\App' => $baseDir.'/../lib/App.php',
	21	+ 'OCA\\Files\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
	22	+ 'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir.'/../lib/BackgroundJob/CleanupFileLocks.php',
	23	+ 'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir.'/../lib/BackgroundJob/DeleteOrphanedItems.php',
	24	+ 'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir.'/../lib/BackgroundJob/ScanFiles.php',
	25	+ 'OCA\\Files\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
	26	+ 'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir.'/../lib/Command/DeleteOrphanedFiles.php',
	27	+ 'OCA\\Files\\Command\\Scan' => $baseDir.'/../lib/Command/Scan.php',
	28	+ 'OCA\\Files\\Command\\ScanAppData' => $baseDir.'/../lib/Command/ScanAppData.php',
	29	+ 'OCA\\Files\\Command\\TransferOwnership' => $baseDir.'/../lib/Command/TransferOwnership.php',
	30	+ 'OCA\\Files\\Controller\\AjaxController' => $baseDir.'/../lib/Controller/AjaxController.php',
	31	+ 'OCA\\Files\\Controller\\ApiController' => $baseDir.'/../lib/Controller/ApiController.php',
	32	+ 'OCA\\Files\\Controller\\SettingsController' => $baseDir.'/../lib/Controller/SettingsController.php',
	33	+ 'OCA\\Files\\Controller\\ViewController' => $baseDir.'/../lib/Controller/ViewController.php',
	34	+ 'OCA\\Files\\Helper' => $baseDir.'/../lib/Helper.php',
	35	+ 'OCA\\Files\\Service\\TagService' => $baseDir.'/../lib/Service/TagService.php',
	36	+ 'OCA\\Files\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
37	37	);

		@@ -6,54 +6,54 @@
		block discarded – undo
6	6
7	7	class ComposerStaticInitFiles
8	8	{
9		- public static $prefixLengthsPsr4 = array (
	9	+ public static $prefixLengthsPsr4 = array(
10	10	'O' =>
11		- array (
	11	+ array(
12	12	'OCA\\Files\\' => 10,
13	13	),
14	14	);
15	15
16		- public static $prefixDirsPsr4 = array (
	16	+ public static $prefixDirsPsr4 = array(
17	17	'OCA\\Files\\' =>
18		- array (
19		- 0 => __DIR__ . '/..' . '/../lib',
	18	+ array(
	19	+ 0 => __DIR__.'/..'.'/../lib',
20	20	),
21	21	);
22	22
23		- public static $classMap = array (
24		- 'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__ . '/..' . '/../lib/Activity/FavoriteProvider.php',
25		- 'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__ . '/..' . '/../lib/Activity/Filter/Favorites.php',
26		- 'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__ . '/..' . '/../lib/Activity/Filter/FileChanges.php',
27		- 'OCA\\Files\\Activity\\Helper' => __DIR__ . '/..' . '/../lib/Activity/Helper.php',
28		- 'OCA\\Files\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
29		- 'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__ . '/..' . '/../lib/Activity/Settings/FavoriteAction.php',
30		- 'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
31		- 'OCA\\Files\\Activity\\Settings\\FileCreated' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileCreated.php',
32		- 'OCA\\Files\\Activity\\Settings\\FileDeleted' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileDeleted.php',
33		- 'OCA\\Files\\Activity\\Settings\\FileFavorite' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavorite.php',
34		- 'OCA\\Files\\Activity\\Settings\\FileRestored' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileRestored.php',
35		- 'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
36		- 'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
37		- 'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupFileLocks.php',
38		- 'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__ . '/..' . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
39		- 'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__ . '/..' . '/../lib/BackgroundJob/ScanFiles.php',
40		- 'OCA\\Files\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
41		- 'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__ . '/..' . '/../lib/Command/DeleteOrphanedFiles.php',
42		- 'OCA\\Files\\Command\\Scan' => __DIR__ . '/..' . '/../lib/Command/Scan.php',
43		- 'OCA\\Files\\Command\\ScanAppData' => __DIR__ . '/..' . '/../lib/Command/ScanAppData.php',
44		- 'OCA\\Files\\Command\\TransferOwnership' => __DIR__ . '/..' . '/../lib/Command/TransferOwnership.php',
45		- 'OCA\\Files\\Controller\\AjaxController' => __DIR__ . '/..' . '/../lib/Controller/AjaxController.php',
46		- 'OCA\\Files\\Controller\\ApiController' => __DIR__ . '/..' . '/../lib/Controller/ApiController.php',
47		- 'OCA\\Files\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
48		- 'OCA\\Files\\Controller\\ViewController' => __DIR__ . '/..' . '/../lib/Controller/ViewController.php',
49		- 'OCA\\Files\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
50		- 'OCA\\Files\\Service\\TagService' => __DIR__ . '/..' . '/../lib/Service/TagService.php',
51		- 'OCA\\Files\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
	23	+ public static $classMap = array(
	24	+ 'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__.'/..'.'/../lib/Activity/FavoriteProvider.php',
	25	+ 'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__.'/..'.'/../lib/Activity/Filter/Favorites.php',
	26	+ 'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__.'/..'.'/../lib/Activity/Filter/FileChanges.php',
	27	+ 'OCA\\Files\\Activity\\Helper' => __DIR__.'/..'.'/../lib/Activity/Helper.php',
	28	+ 'OCA\\Files\\Activity\\Provider' => __DIR__.'/..'.'/../lib/Activity/Provider.php',
	29	+ 'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__.'/..'.'/../lib/Activity/Settings/FavoriteAction.php',
	30	+ 'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__.'/..'.'/../lib/Activity/Settings/FileChanged.php',
	31	+ 'OCA\\Files\\Activity\\Settings\\FileCreated' => __DIR__.'/..'.'/../lib/Activity/Settings/FileCreated.php',
	32	+ 'OCA\\Files\\Activity\\Settings\\FileDeleted' => __DIR__.'/..'.'/../lib/Activity/Settings/FileDeleted.php',
	33	+ 'OCA\\Files\\Activity\\Settings\\FileFavorite' => __DIR__.'/..'.'/../lib/Activity/Settings/FileFavorite.php',
	34	+ 'OCA\\Files\\Activity\\Settings\\FileRestored' => __DIR__.'/..'.'/../lib/Activity/Settings/FileRestored.php',
	35	+ 'OCA\\Files\\App' => __DIR__.'/..'.'/../lib/App.php',
	36	+ 'OCA\\Files\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
	37	+ 'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__.'/..'.'/../lib/BackgroundJob/CleanupFileLocks.php',
	38	+ 'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__.'/..'.'/../lib/BackgroundJob/DeleteOrphanedItems.php',
	39	+ 'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__.'/..'.'/../lib/BackgroundJob/ScanFiles.php',
	40	+ 'OCA\\Files\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
	41	+ 'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__.'/..'.'/../lib/Command/DeleteOrphanedFiles.php',
	42	+ 'OCA\\Files\\Command\\Scan' => __DIR__.'/..'.'/../lib/Command/Scan.php',
	43	+ 'OCA\\Files\\Command\\ScanAppData' => __DIR__.'/..'.'/../lib/Command/ScanAppData.php',
	44	+ 'OCA\\Files\\Command\\TransferOwnership' => __DIR__.'/..'.'/../lib/Command/TransferOwnership.php',
	45	+ 'OCA\\Files\\Controller\\AjaxController' => __DIR__.'/..'.'/../lib/Controller/AjaxController.php',
	46	+ 'OCA\\Files\\Controller\\ApiController' => __DIR__.'/..'.'/../lib/Controller/ApiController.php',
	47	+ 'OCA\\Files\\Controller\\SettingsController' => __DIR__.'/..'.'/../lib/Controller/SettingsController.php',
	48	+ 'OCA\\Files\\Controller\\ViewController' => __DIR__.'/..'.'/../lib/Controller/ViewController.php',
	49	+ 'OCA\\Files\\Helper' => __DIR__.'/..'.'/../lib/Helper.php',
	50	+ 'OCA\\Files\\Service\\TagService' => __DIR__.'/..'.'/../lib/Service/TagService.php',
	51	+ 'OCA\\Files\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
52	52	);
53	53
54	54	public static function getInitializer(ClassLoader $loader)
55	55	{
56		- return \Closure::bind(function () use ($loader) {
	56	+ return \Closure::bind(function() use ($loader) {
57	57	$loader->prefixLengthsPsr4 = ComposerStaticInitFiles::$prefixLengthsPsr4;
58	58	$loader->prefixDirsPsr4 = ComposerStaticInitFiles::$prefixDirsPsr4;
59	59	$loader->classMap = ComposerStaticInitFiles::$classMap;

		@@ -32,7 +32,7 @@ discard block
		block discarded – undo
32	32	$l = \OC::$server->getL10N('files');
33	33
34	34	// Load the files
35		-$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
	35	+$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : '';
36	36	$dir = \OC\Files\Filesystem::normalizePath($dir);
37	37
38	38	try {
		@@ -43,11 +43,11 @@ discard block
		block discarded – undo
43	43	}
44	44
45	45	$data = array();
46		- $baseUrl = \OC::$server->getURLGenerator()->linkTo('files', 'index.php') . '?dir=';
	46	+ $baseUrl = \OC::$server->getURLGenerator()->linkTo('files', 'index.php').'?dir=';
47	47
48	48	$permissions = $dirInfo->getPermissions();
49	49
50		- $sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
	50	+ $sortAttribute = isset($_GET['sort']) ? (string) $_GET['sort'] : 'name';
51	51	$sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
52	52	$mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : '';
53	53

nextcloud / server

Push — master ( 27f492...c31d31 )

Status

Category

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

Spacing +35 added lines, -35 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch