nextcloud / server

lib/private/Activity/EventMerger.php

Spacing +12 added lines, -12 removed lines

@@ -133,10 +133,10 @@ 
 
 		// Check that all parameters from $event exist in $previousEvent
 		foreach ($params1 as $key => $parameter) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+			if (preg_match('/^'.$mergeParameter.'(\d+)?$/', $key)) {
 				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
 					$combined++;
-					$params[$mergeParameter . $combined] = $parameter;
+					$params[$mergeParameter.$combined] = $parameter;
 				}
 				continue;
 			}
@@ -151,10 +151,10 @@ 
 
 		// Check that all parameters from $previousEvent exist in $event
 		foreach ($params2 as $key => $parameter) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+			if (preg_match('/^'.$mergeParameter.'(\d+)?$/', $key)) {
 				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
 					$combined++;
-					$params[$mergeParameter . $combined] = $parameter;
+					$params[$mergeParameter.$combined] = $parameter;
 				}
 				continue;
 			}
@@ -178,7 +178,7 @@ 
 	 */
 	protected function checkParameterAlreadyExits($parameters, $mergeParameter, $parameter) {
 		foreach ($parameters as $key => $param) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+			if (preg_match('/^'.$mergeParameter.'(\d+)?$/', $key)) {
 				if ($param === $parameter) {
 					return true;
 				}
@@ -196,30 +196,30 @@ 
 	protected function getExtendedSubject($subject, $parameter, $counter) {
 		switch ($counter) {
 			case 1:
-				$replacement = '{' . $parameter . '1}';
+				$replacement = '{'.$parameter.'1}';
 				break;
 			case 2:
 				$replacement = $this->l10n->t(
 					'%1$s and %2$s',
-					['{' . $parameter . '2}', '{' . $parameter . '1}']
+					['{'.$parameter.'2}', '{'.$parameter.'1}']
 				);
 				break;
 			case 3:
 				$replacement = $this->l10n->t(
 					'%1$s, %2$s and %3$s',
-					['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+					['{'.$parameter.'3}', '{'.$parameter.'2}', '{'.$parameter.'1}']
 				);
 				break;
 			case 4:
 				$replacement = $this->l10n->t(
 					'%1$s, %2$s, %3$s and %4$s',
-					['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+					['{'.$parameter.'4}', '{'.$parameter.'3}', '{'.$parameter.'2}', '{'.$parameter.'1}']
 				);
 				break;
 			case 5:
 				$replacement = $this->l10n->t(
 					'%1$s, %2$s, %3$s, %4$s and %5$s',
-					['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+					['{'.$parameter.'5}', '{'.$parameter.'4}', '{'.$parameter.'3}', '{'.$parameter.'2}', '{'.$parameter.'1}']
 				);
 				break;
 			default:
@@ -227,7 +227,7 @@ 
 		}
 
 		return str_replace(
-			'{' . $parameter . '}',
+			'{'.$parameter.'}',
 			$replacement,
 			$subject
 		);
@@ -241,7 +241,7 @@ 
 	protected function generateParsedSubject($subject, $parameters) {
 		$placeholders = $replacements = [];
 		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
+			$placeholders[] = '{'.$placeholder.'}';
 			if ($parameter['type'] === 'file') {
 				$replacements[] = trim($parameter['path'], '/');
 			} else if (isset($parameter['name'])) {

core/Controller/CssController.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
 			$folder = $this->appData->getFolder($appName);
 			$gzip = false;
 			$file = $this->getFile($folder, $fileName, $gzip);
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			return new NotFoundResponse();
 		}
 
@@ -95,7 +95,7 @@ 
 		if ($encoding !== null && strpos($encoding, 'gzip') !== false) {
 			try {
 				$gzip = true;
-				return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
+				return $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz
 			} catch (NotFoundException $e) {
 				// continue
 			}

core/Controller/JsController.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
 			$folder = $this->appData->getFolder($appName);
 			$gzip = false;
 			$file = $this->getFile($folder, $fileName, $gzip);
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			return new NotFoundResponse();
 		}
 
@@ -95,7 +95,7 @@ 
 		if ($encoding !== null && strpos($encoding, 'gzip') !== false) {
 			try {
 				$gzip = true;
-				return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
+				return $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz
 			} catch (NotFoundException $e) {
 				// continue
 			}

lib/private/Files/Cache/Cache.php

Spacing +39 added lines, -39 removed lines

@@ -163,21 +163,21 @@ 
 	 */
 	public static function cacheEntryFromData($data, IMimeTypeLoader $mimetypeLoader) {
 		//fix types
-		$data['fileid'] = (int)$data['fileid'];
-		$data['parent'] = (int)$data['parent'];
+		$data['fileid'] = (int) $data['fileid'];
+		$data['parent'] = (int) $data['parent'];
 		$data['size'] = 0 + $data['size'];
-		$data['mtime'] = (int)$data['mtime'];
-		$data['storage_mtime'] = (int)$data['storage_mtime'];
-		$data['encryptedVersion'] = (int)$data['encrypted'];
-		$data['encrypted'] = (bool)$data['encrypted'];
+		$data['mtime'] = (int) $data['mtime'];
+		$data['storage_mtime'] = (int) $data['storage_mtime'];
+		$data['encryptedVersion'] = (int) $data['encrypted'];
+		$data['encrypted'] = (bool) $data['encrypted'];
 		$data['storage_id'] = $data['storage'];
-		$data['storage'] = (int)$data['storage'];
+		$data['storage'] = (int) $data['storage'];
 		$data['mimetype'] = $mimetypeLoader->getMimetypeById($data['mimetype']);
 		$data['mimepart'] = $mimetypeLoader->getMimetypeById($data['mimepart']);
 		if ($data['storage_mtime'] == 0) {
 			$data['storage_mtime'] = $data['mtime'];
 		}
-		$data['permissions'] = (int)$data['permissions'];
+		$data['permissions'] = (int) $data['permissions'];
 		return new CacheEntry($data);
 	}
 
@@ -205,8 +205,8 @@ 
 					FROM `*PREFIX*filecache` WHERE `parent` = ? ORDER BY `name` ASC';
 			$result = $this->connection->executeQuery($sql, [$fileId]);
 			$files = $result->fetchAll();
-			return array_map(function (array $data) {
-				return self::cacheEntryFromData($data, $this->mimetypeLoader);;
+			return array_map(function(array $data) {
+				return self::cacheEntryFromData($data, $this->mimetypeLoader); ;
 			}, $files);
 		} else {
 			return array();
@@ -265,7 +265,7 @@ 
 		$queryParts[] = '`storage`';
 		$params[] = $this->getNumericStorageId();
 
-		$queryParts = array_map(function ($item) {
+		$queryParts = array_map(function($item) {
 			return trim($item, "`");
 		}, $queryParts);
 		$values = array_combine($queryParts, $params);
@@ -274,7 +274,7 @@ 
 			'path_hash',
 		])
 		) {
-			return (int)$this->connection->lastInsertId('*PREFIX*filecache');
+			return (int) $this->connection->lastInsertId('*PREFIX*filecache');
 		}
 
 		// The file was created in the mean time
@@ -312,10 +312,10 @@ 
 
 		// don't update if the data we try to set is the same as the one in the record
 		// some databases (Postgres) don't like superfluous updates
-		$sql = 'UPDATE `*PREFIX*filecache` SET ' . implode(' = ?, ', $queryParts) . '=? ' .
-			'WHERE (' .
-			implode(' <> ? OR ', $queryParts) . ' <> ? OR ' .
-			implode(' IS NULL OR ', $queryParts) . ' IS NULL' .
+		$sql = 'UPDATE `*PREFIX*filecache` SET '.implode(' = ?, ', $queryParts).'=? '.
+			'WHERE ('.
+			implode(' <> ? OR ', $queryParts).' <> ? OR '.
+			implode(' IS NULL OR ', $queryParts).' IS NULL'.
 			') AND `fileid` = ? ';
 		$this->connection->executeQuery($sql, $params);
 
@@ -366,7 +366,7 @@ 
 					}
 				}
 				$params[] = $value;
-				$queryParts[] = '`' . $name . '`';
+				$queryParts[] = '`'.$name.'`';
 			}
 		}
 		return array($queryParts, $params);
@@ -408,7 +408,7 @@ 
 			return -1;
 		} else {
 			$parent = $this->getParentPath($file);
-			return (int)$this->getId($parent);
+			return (int) $this->getId($parent);
 		}
 	}
 
@@ -454,7 +454,7 @@ 
 	 */
 	private function getSubFolders($entry) {
 		$children = $this->getFolderContentsById($entry['fileid']);
-		return array_filter($children, function ($child) {
+		return array_filter($children, function($child) {
 			return $child['mimetype'] === 'httpd/unix-directory';
 		});
 	}
@@ -517,10 +517,10 @@ 
 			list($targetStorageId, $targetPath) = $this->getMoveInfo($targetPath);
 
 			if (is_null($sourceStorageId) || $sourceStorageId === false) {
-				throw new \Exception('Invalid source storage id: ' . $sourceStorageId);
+				throw new \Exception('Invalid source storage id: '.$sourceStorageId);
 			}
 			if (is_null($targetStorageId) || $targetStorageId === false) {
-				throw new \Exception('Invalid target storage id: ' . $targetStorageId);
+				throw new \Exception('Invalid target storage id: '.$targetStorageId);
 			}
 
 			$this->connection->beginTransaction();
@@ -539,7 +539,7 @@ 
 					->set('path_hash', $fun->md5($newPathFunction))
 					->set('path', $newPathFunction)
 					->where($query->expr()->eq('storage', $query->createNamedParameter($sourceStorageId, IQueryBuilder::PARAM_INT)))
-					->andWhere($query->expr()->like('path', $query->createNamedParameter($this->connection->escapeLikeParameter($sourcePath) . '/%')));
+					->andWhere($query->expr()->like('path', $query->createNamedParameter($this->connection->escapeLikeParameter($sourcePath).'/%')));
 
 				try {
 					$query->execute();
@@ -588,7 +588,7 @@ 
 		$sql = 'SELECT `size` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?';
 		$result = $this->connection->executeQuery($sql, array($this->getNumericStorageId(), $pathHash));
 		if ($row = $result->fetch()) {
-			if ((int)$row['size'] === -1) {
+			if ((int) $row['size'] === -1) {
 				return self::SHALLOW;
 			} else {
 				return self::COMPLETE;
@@ -637,7 +637,7 @@ 
 	private function searchResultToCacheEntries(Statement $result) {
 		$files = $result->fetchAll();
 
-		return array_map(function (array $data) {
+		return array_map(function(array $data) {
 			return self::cacheEntryFromData($data, $this->mimetypeLoader);
 		}, $files);
 	}
@@ -656,7 +656,7 @@ 
 			$where = '`mimepart` = ?';
 		}
 		$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `storage_mtime`, `mtime`, `encrypted`, `etag`, `permissions`, `checksum`
-				FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `storage` = ?';
+				FROM `*PREFIX*filecache` WHERE ' . $where.' AND `storage` = ?';
 		$mimetype = $this->mimetypeLoader->getId($mimetype);
 		$result = $this->connection->executeQuery($sql, array($mimetype, $this->getNumericStorageId()));
 
@@ -707,20 +707,20 @@ 
 	 * @return ICacheEntry[] file data
 	 */
 	public function searchByTag($tag, $userId) {
-		$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, ' .
-			'`mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, ' .
-			'`encrypted`, `etag`, `permissions`, `checksum` ' .
-			'FROM `*PREFIX*filecache` `file`, ' .
-			'`*PREFIX*vcategory_to_object` `tagmap`, ' .
-			'`*PREFIX*vcategory` `tag` ' .
+		$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, '.
+			'`mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, '.
+			'`encrypted`, `etag`, `permissions`, `checksum` '.
+			'FROM `*PREFIX*filecache` `file`, '.
+			'`*PREFIX*vcategory_to_object` `tagmap`, '.
+			'`*PREFIX*vcategory` `tag` '.
 			// JOIN filecache to vcategory_to_object
-			'WHERE `file`.`fileid` = `tagmap`.`objid` ' .
+			'WHERE `file`.`fileid` = `tagmap`.`objid` '.
 			// JOIN vcategory_to_object to vcategory
-			'AND `tagmap`.`type` = `tag`.`type` ' .
-			'AND `tagmap`.`categoryid` = `tag`.`id` ' .
+			'AND `tagmap`.`type` = `tag`.`type` '.
+			'AND `tagmap`.`categoryid` = `tag`.`id` '.
 			// conditions
-			'AND `file`.`storage` = ? ' .
-			'AND `tag`.`type` = \'files\' ' .
+			'AND `file`.`storage` = ? '.
+			'AND `tag`.`type` = \'files\' '.
 			'AND `tag`.`uid` = ? ';
 		if (is_int($tag)) {
 			$sql .= 'AND `tag`.`id` = ? ';
@@ -738,7 +738,7 @@ 
 
 		$files = $result->fetchAll();
 
-		return array_map(function (array $data) {
+		return array_map(function(array $data) {
 			return self::cacheEntryFromData($data, $this->mimetypeLoader);
 		}, $files);
 	}
@@ -774,8 +774,8 @@ 
 		}
 		if (isset($entry['mimetype']) && $entry['mimetype'] === 'httpd/unix-directory') {
 			$id = $entry['fileid'];
-			$sql = 'SELECT SUM(`size`) AS f1, MIN(`size`) AS f2 ' .
-				'FROM `*PREFIX*filecache` ' .
+			$sql = 'SELECT SUM(`size`) AS f1, MIN(`size`) AS f2 '.
+				'FROM `*PREFIX*filecache` '.
 				'WHERE `parent` = ? AND `storage` = ?';
 			$result = $this->connection->executeQuery($sql, array($id, $this->getNumericStorageId()));
 			if ($row = $result->fetch()) {

lib/private/Repair/CleanTags.php

Spacing +3 added lines, -3 removed lines

@@ -171,14 +171,14 @@
 	protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) {
 		$qb = $this->connection->getQueryBuilder();
 
-		$qb->select('d.' . $deleteId)
+		$qb->select('d.'.$deleteId)
 			->from($deleteTable, 'd')
-			->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.' . $deleteId, 's.' . $sourceId))
+			->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.'.$deleteId, 's.'.$sourceId))
 			->where(
 				$qb->expr()->eq('d.type', $qb->expr()->literal('files'))
 			)
 			->andWhere(
-				$qb->expr()->isNull('s.' . $sourceNullColumn)
+				$qb->expr()->isNull('s.'.$sourceNullColumn)
 			);
 		$result = $qb->execute();
 

apps/user_ldap/lib/Controller/RenewPasswordController.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 	 * @return TemplateResponse|RedirectResponse
 	 */
 	public function showRenewPasswordForm($user) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+		if ($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
 			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
 		}
 		$parameters = [];
@@ -129,7 +129,7 @@ 
 	 * @return RedirectResponse
 	 */
 	public function tryRenewPassword($user, $oldPassword, $newPassword) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+		if ($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
 			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
 		}
 		$args = !is_null($user) ? ['user' => $user] : [];

remote.php

Spacing +13 added lines, -13 removed lines

@@ -54,7 +54,7 @@ 
 			// we shall not log on RemoteException
 			$server->addPlugin(new ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
 		}
-		$server->on('beforeMethod', function () use ($e) {
+		$server->on('beforeMethod', function() use ($e) {
 			if ($e instanceof RemoteException) {
 				switch ($e->getCode()) {
 					case OC_Response::STATUS_SERVICE_UNAVAILABLE:
@@ -70,7 +70,7 @@ 
 		$server->exec();
 	} else {
 		$statusCode = OC_Response::STATUS_INTERNAL_SERVER_ERROR;
-		if ($e instanceof \OC\ServiceUnavailableException ) {
+		if ($e instanceof \OC\ServiceUnavailableException) {
 			$statusCode = OC_Response::STATUS_SERVICE_UNAVAILABLE;
 		}
 		if ($e instanceof RemoteException) {
@@ -103,11 +103,11 @@ 
 		return $services[$service];
 	}
 
-	return \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
+	return \OC::$server->getConfig()->getAppValue('core', 'remote_'.$service);
 }
 
 try {
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	// All resources served via the DAV endpoint should have the strictest possible
 	// policy. Exempted from this is the SabreDAV browser plugin which overwrites
@@ -128,18 +128,18 @@ 
 	if (!$pos = strpos($pathInfo, '/', 1)) {
 		$pos = strlen($pathInfo);
 	}
-	$service=substr($pathInfo, 1, $pos-1);
+	$service = substr($pathInfo, 1, $pos - 1);
 
 	$file = resolveService($service);
 
-	if(is_null($file)) {
+	if (is_null($file)) {
 		throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
 	}
 
-	$file=ltrim($file, '/');
+	$file = ltrim($file, '/');
 
-	$parts=explode('/', $file, 2);
-	$app=$parts[0];
+	$parts = explode('/', $file, 2);
+	$app = $parts[0];
 
 	// Load all required applications
 	\OC::$REQUESTEDAPP = $app;
@@ -148,17 +148,17 @@ 
 
 	switch ($app) {
 		case 'core':
-			$file =  OC::$SERVERROOT .'/'. $file;
+			$file = OC::$SERVERROOT.'/'.$file;
 			break;
 		default:
 			if (!\OC::$server->getAppManager()->isInstalled($app)) {
-				throw new RemoteException('App not installed: ' . $app);
+				throw new RemoteException('App not installed: '.$app);
 			}
 			OC_App::loadApp($app);
-			$file = OC_App::getAppPath($app) .'/'. $parts[1];
+			$file = OC_App::getAppPath($app).'/'.$parts[1];
 			break;
 	}
-	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
+	$baseuri = OC::$WEBROOT.'/remote.php/'.$service.'/';
 	require_once $file;
 
 } catch (Exception $ex) {

settings/Mailer/NewUserMailHelper.php

Spacing +4 added lines, -4 removed lines

@@ -102,13 +102,13 @@
 		if ($generatePasswordResetToken) {
 			$token = $this->secureRandom->generate(
 				21,
-				ISecureRandom::CHAR_DIGITS .
-				ISecureRandom::CHAR_LOWER .
+				ISecureRandom::CHAR_DIGITS.
+				ISecureRandom::CHAR_LOWER.
 				ISecureRandom::CHAR_UPPER
 			);
-			$tokenValue = $this->timeFactory->getTime() . ':' . $token;
+			$tokenValue = $this->timeFactory->getTime().':'.$token;
 			$mailAddress = (null !== $user->getEMailAddress()) ? $user->getEMailAddress() : '';
-			$encryptedValue = $this->crypto->encrypt($tokenValue, $mailAddress . $this->config->getSystemValue('secret'));
+			$encryptedValue = $this->crypto->encrypt($tokenValue, $mailAddress.$this->config->getSystemValue('secret'));
 			$this->config->setUserValue($user->getUID(), 'core', 'lostpassword', $encryptedValue);
 			$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', ['userId' => $user->getUID(), 'token' => $token]);
 		} else {

lib/private/Template/Base.php

Spacing +11 added lines, -11 removed lines

@@ -46,7 +46,7 @@ 
 	 * @param \OCP\IL10N $l10n
 	 * @param Defaults $theme
 	 */
-	public function __construct($template, $requestToken, $l10n, $theme ) {
+	public function __construct($template, $requestToken, $l10n, $theme) {
 		$this->vars = array();
 		$this->vars['requesttoken'] = $requestToken;
 		$this->l10n = $l10n;
@@ -63,7 +63,7 @@ 
 	 */
 	protected function getAppTemplateDirs($theme, $app, $serverRoot, $app_dir) {
 		// Check if the app is in the app folder or in the root
-		if( file_exists($app_dir.'/templates/' )) {
+		if (file_exists($app_dir.'/templates/')) {
 			return [
 				$serverRoot.'/themes/'.$theme.'/apps/'.$app.'/templates/',
 				$app_dir.'/templates/',
@@ -98,7 +98,7 @@ 
 	 *
 	 * If the key existed before, it will be overwritten
 	 */
-	public function assign( $key, $value) {
+	public function assign($key, $value) {
 		$this->vars[$key] = $value;
 		return true;
 	}
@@ -113,12 +113,12 @@ 
 	 * exists, the value will be appended. It can be accessed via
 	 * $_[$key][$position] in the template.
 	 */
-	public function append( $key, $value ) {
-		if( array_key_exists( $key, $this->vars )) {
+	public function append($key, $value) {
+		if (array_key_exists($key, $this->vars)) {
 			$this->vars[$key][] = $value;
 		}
-		else{
-			$this->vars[$key] = array( $value );
+		else {
+			$this->vars[$key] = array($value);
 		}
 	}
 
@@ -130,10 +130,10 @@ 
 	 */
 	public function printPage() {
 		$data = $this->fetchPage();
-		if( $data === false ) {
+		if ($data === false) {
 			return false;
 		}
-		else{
+		else {
 			print $data;
 			return true;
 		}
@@ -166,8 +166,8 @@ 
 		$l = $this->l10n;
 		$theme = $this->theme;
 
-		if( !is_null($additionalParams)) {
-			$_ = array_merge( $additionalParams, $this->vars );
+		if (!is_null($additionalParams)) {
+			$_ = array_merge($additionalParams, $this->vars);
 		}
 
 		// Include