nextcloud / server

lib/private/Cache/File.php

Spacing +11 added lines, -11 removed lines

@@ -55,10 +55,10 @@ 
 			$rootView = new View();
 			$user = \OC::$server->getUserSession()->getUser();
 			Filesystem::initMountPoints($user->getUID());
-			if (!$rootView->file_exists('/' . $user->getUID() . '/cache')) {
-				$rootView->mkdir('/' . $user->getUID() . '/cache');
+			if (!$rootView->file_exists('/'.$user->getUID().'/cache')) {
+				$rootView->mkdir('/'.$user->getUID().'/cache');
 			}
-			$this->storage = new View('/' . $user->getUID() . '/cache');
+			$this->storage = new View('/'.$user->getUID().'/cache');
 			return $this->storage;
 		} else {
 			\OCP\Util::writeLog('core', 'Can\'t get cache storage, user not logged in', ILogger::ERROR);
@@ -108,12 +108,12 @@ 
 		// unique id to avoid chunk collision, just in case
 		$uniqueId = \OC::$server->getSecureRandom()->generate(
 			16,
-			ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER
+			ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER
 		);
 
 		// use part file to prevent hasKey() to find the key
 		// while it is being written
-		$keyPart = $key . '.' . $uniqueId . '.part';
+		$keyPart = $key.'.'.$uniqueId.'.part';
 		if ($storage and $storage->file_put_contents($keyPart, $value)) {
 			if ($ttl === 0) {
 				$ttl = 86400; // 60*60*24
@@ -162,7 +162,7 @@ 
 			if (is_resource($dh)) {
 				while (($file = readdir($dh)) !== false) {
 					if ($file != '.' and $file != '..' and ($prefix === '' || strpos($file, $prefix) === 0)) {
-						$storage->unlink('/' . $file);
+						$storage->unlink('/'.$file);
 					}
 				}
 			}
@@ -187,17 +187,17 @@ 
 			while (($file = readdir($dh)) !== false) {
 				if ($file != '.' and $file != '..') {
 					try {
-						$mtime = $storage->filemtime('/' . $file);
+						$mtime = $storage->filemtime('/'.$file);
 						if ($mtime < $now) {
-							$storage->unlink('/' . $file);
+							$storage->unlink('/'.$file);
 						}
 					} catch (\OCP\Lock\LockedException $e) {
 						// ignore locked chunks
-						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "'.$file.'"', ['app' => 'core']);
 					} catch (\OCP\Files\ForbiddenException $e) {
-						\OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "' . $file . '"', ['app' => 'core']);
+						\OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "'.$file.'"', ['app' => 'core']);
 					} catch (\OCP\Files\LockNotAcquiredException $e) {
-						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "'.$file.'"', ['app' => 'core']);
 					}
 				}
 			}

lib/private/Route/CachingRouter.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 */
 	public function generate($name, $parameters = [], $absolute = false) {
 		asort($parameters);
-		$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . (int)$absolute;
+		$key = $this->context->getHost().'#'.$this->context->getBaseUrl().$name.sha1(json_encode($parameters)).(int) $absolute;
 		$cachedKey = $this->cache->get($key);
 		if ($cachedKey) {
 			return $cachedKey;

lib/private/Repair/Collation.php

Spacing +11 added lines, -11 removed lines

@@ -78,7 +78,7 @@ 
 		$tables = $this->getAllNonUTF8BinTables($this->connection);
 		foreach ($tables as $table) {
 			$output->info("Change row format for $table ...");
-			$query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT = DYNAMIC;');
+			$query = $this->connection->prepare('ALTER TABLE `'.$table.'` ROW_FORMAT = DYNAMIC;');
 			try {
 				$query->execute();
 			} catch (DriverException $e) {
@@ -92,10 +92,10 @@ 
 			$output->info("Change collation for $table ...");
 			if ($characterSet === 'utf8mb4') {
 				// need to set row compression first
-				$query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT=COMPRESSED;');
+				$query = $this->connection->prepare('ALTER TABLE `'.$table.'` ROW_FORMAT=COMPRESSED;');
 				$query->execute();
 			}
-			$query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET ' . $characterSet . ' COLLATE ' . $characterSet . '_bin;');
+			$query = $this->connection->prepare('ALTER TABLE `'.$table.'` CONVERT TO CHARACTER SET '.$characterSet.' COLLATE '.$characterSet.'_bin;');
 			try {
 				$query->execute();
 			} catch (DriverException $e) {
@@ -121,10 +121,10 @@ 
 
 		// fetch tables by columns
 		$statement = $connection->executeQuery(
-			"SELECT DISTINCT(TABLE_NAME) AS `table`" .
-			"	FROM INFORMATION_SCHEMA . COLUMNS" .
-			"	WHERE TABLE_SCHEMA = ?" .
-			"	AND (COLLATION_NAME <> '" . $characterSet . "_bin' OR CHARACTER_SET_NAME <> '" . $characterSet . "')" .
+			"SELECT DISTINCT(TABLE_NAME) AS `table`".
+			"	FROM INFORMATION_SCHEMA . COLUMNS".
+			"	WHERE TABLE_SCHEMA = ?".
+			"	AND (COLLATION_NAME <> '".$characterSet."_bin' OR CHARACTER_SET_NAME <> '".$characterSet."')".
 			"	AND TABLE_NAME LIKE '*PREFIX*%'",
 			[$dbName]
 		);
@@ -136,10 +136,10 @@ 
 
 		// fetch tables by collation
 		$statement = $connection->executeQuery(
-			"SELECT DISTINCT(TABLE_NAME) AS `table`" .
-			"	FROM INFORMATION_SCHEMA . TABLES" .
-			"	WHERE TABLE_SCHEMA = ?" .
-			"	AND TABLE_COLLATION <> '" . $characterSet . "_bin'" .
+			"SELECT DISTINCT(TABLE_NAME) AS `table`".
+			"	FROM INFORMATION_SCHEMA . TABLES".
+			"	WHERE TABLE_SCHEMA = ?".
+			"	AND TABLE_COLLATION <> '".$characterSet."_bin'".
 			"	AND TABLE_NAME LIKE '*PREFIX*%'",
 			[$dbName]
 		);

lib/private/Archive/TAR.php

Spacing +17 added lines, -17 removed lines

@@ -91,20 +91,20 @@ 
 	 */
 	public function addFolder($path) {
 		$tmpBase = \OC::$server->getTempManager()->getTemporaryFolder();
-		$path = rtrim($path, '/') . '/';
+		$path = rtrim($path, '/').'/';
 		if ($this->fileExists($path)) {
 			return false;
 		}
 		$parts = explode('/', $path);
 		$folder = $tmpBase;
 		foreach ($parts as $part) {
-			$folder .= '/' . $part;
+			$folder .= '/'.$part;
 			if (!is_dir($folder)) {
 				mkdir($folder);
 			}
 		}
-		$result = $this->tar->addModify([$tmpBase . $path], '', $tmpBase);
-		rmdir($tmpBase . $path);
+		$result = $this->tar->addModify([$tmpBase.$path], '', $tmpBase);
+		rmdir($tmpBase.$path);
 		$this->fileList = false;
 		$this->cachedHeaders = false;
 		return $result;
@@ -141,12 +141,12 @@ 
 		//no proper way to delete, rename entire archive, rename file and remake archive
 		$tmp = \OC::$server->getTempManager()->getTemporaryFolder();
 		$this->tar->extract($tmp);
-		rename($tmp . $source, $tmp . $dest);
+		rename($tmp.$source, $tmp.$dest);
 		$this->tar = null;
 		unlink($this->path);
 		$types = [null, 'gz', 'bz'];
 		$this->tar = new \Archive_Tar($this->path, $types[self::getTarType($this->path)]);
-		$this->tar->createModify([$tmp], '', $tmp . '/');
+		$this->tar->createModify([$tmp], '', $tmp.'/');
 		$this->fileList = false;
 		$this->cachedHeaders = false;
 		return true;
@@ -161,9 +161,9 @@ 
 		}
 		foreach ($this->cachedHeaders as $header) {
 			if ($file == $header['filename']
-				or $file . '/' == $header['filename']
-				or '/' . $file . '/' == $header['filename']
-				or '/' . $file == $header['filename']
+				or $file.'/' == $header['filename']
+				or '/'.$file.'/' == $header['filename']
+				or '/'.$file == $header['filename']
 			) {
 				return $header;
 			}
@@ -262,13 +262,13 @@ 
 		if (!$this->fileExists($path)) {
 			return false;
 		}
-		if ($this->fileExists('/' . $path)) {
-			$success = $this->tar->extractList(['/' . $path], $tmp);
+		if ($this->fileExists('/'.$path)) {
+			$success = $this->tar->extractList(['/'.$path], $tmp);
 		} else {
 			$success = $this->tar->extractList([$path], $tmp);
 		}
 		if ($success) {
-			rename($tmp . $path, $dest);
+			rename($tmp.$path, $dest);
 		}
 		\OCP\Files::rmdirr($tmp);
 		return $success;
@@ -292,10 +292,10 @@ 
 	 */
 	public function fileExists($path) {
 		$files = $this->getFiles();
-		if ((array_search($path, $files) !== false) or (array_search($path . '/', $files) !== false)) {
+		if ((array_search($path, $files) !== false) or (array_search($path.'/', $files) !== false)) {
 			return true;
 		} else {
-			$folderPath = rtrim($path, '/') . '/';
+			$folderPath = rtrim($path, '/').'/';
 			$pathLength = strlen($folderPath);
 			foreach ($files as $file) {
 				if (strlen($file) > $pathLength and substr($file, 0, $pathLength) == $folderPath) {
@@ -304,7 +304,7 @@ 
 			}
 		}
 		if ($path[0] != '/') { //not all programs agree on the use of a leading /
-			return $this->fileExists('/' . $path);
+			return $this->fileExists('/'.$path);
 		} else {
 			return false;
 		}
@@ -325,7 +325,7 @@ 
 		//no proper way to delete, extract entire archive, delete file and remake archive
 		$tmp = \OC::$server->getTempManager()->getTemporaryFolder();
 		$this->tar->extract($tmp);
-		\OCP\Files::rmdirr($tmp . $path);
+		\OCP\Files::rmdirr($tmp.$path);
 		$this->tar = null;
 		unlink($this->path);
 		$this->reopen();
@@ -356,7 +356,7 @@ 
 			return fopen($tmpFile, $mode);
 		} else {
 			$handle = fopen($tmpFile, $mode);
-			return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+			return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 				$this->writeBack($tmpFile, $path);
 			});
 		}

lib/private/Authentication/WebAuthn/CredentialRepository.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 		$uid = $publicKeyCredentialUserEntity->getId();
 		$entities = $this->credentialMapper->findAllForUid($uid);
 
-		return array_map(function (PublicKeyCredentialEntity $entity) {
+		return array_map(function(PublicKeyCredentialEntity $entity) {
 			return $entity->toPublicKeyCredentialSource();
 		}, $entities);
 	}

lib/private/Files/Stream/SeekableHttpStream.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
 		]);
 
 		SeekableHttpStream::registerIfNeeded();
-		return fopen(SeekableHttpStream::PROTOCOL . '://', 'r', false, $context);
+		return fopen(SeekableHttpStream::PROTOCOL.'://', 'r', false, $context);
 	}
 
 	/** @var resource */
@@ -77,7 +77,7 @@ 
 	private $offset = 0;
 
 	private function reconnect(int $start) {
-		$range = $start . '-';
+		$range = $start.'-';
 		if ($this->current != null) {
 			fclose($this->current);
 		}
@@ -89,7 +89,7 @@ 
 		}
 
 		$responseHead = stream_get_meta_data($this->current)['wrapper_data'];
-		$rangeHeaders = array_values(array_filter($responseHead, function ($v) {
+		$rangeHeaders = array_values(array_filter($responseHead, function($v) {
 			return preg_match('#^content-range:#i', $v) === 1;
 		}));
 		if (!$rangeHeaders) {

lib/private/legacy/OC_User.php

Spacing +7 added lines, -7 removed lines

@@ -91,7 +91,7 @@ 
 				case 'database':
 				case 'mysql':
 				case 'sqlite':
-					\OCP\Util::writeLog('core', 'Adding user backend ' . $backend . '.', ILogger::DEBUG);
+					\OCP\Util::writeLog('core', 'Adding user backend '.$backend.'.', ILogger::DEBUG);
 					self::$_usedBackends[$backend] = new \OC\User\Database();
 					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
@@ -100,8 +100,8 @@ 
 					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
 				default:
-					\OCP\Util::writeLog('core', 'Adding default user backend ' . $backend . '.', ILogger::DEBUG);
-					$className = 'OC_USER_' . strtoupper($backend);
+					\OCP\Util::writeLog('core', 'Adding default user backend '.$backend.'.', ILogger::DEBUG);
+					$className = 'OC_USER_'.strtoupper($backend);
 					self::$_usedBackends[$backend] = new $className();
 					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
@@ -145,10 +145,10 @@ 
 					self::useBackend($backend);
 					self::$_setupedBackends[] = $i;
 				} else {
-					\OCP\Util::writeLog('core', 'User backend ' . $class . ' already initialized.', ILogger::DEBUG);
+					\OCP\Util::writeLog('core', 'User backend '.$class.' already initialized.', ILogger::DEBUG);
 				}
 			} else {
-				\OCP\Util::writeLog('core', 'User backend ' . $class . ' not found.', ILogger::ERROR);
+				\OCP\Util::writeLog('core', 'User backend '.$class.' not found.', ILogger::ERROR);
 			}
 		}
 	}
@@ -270,7 +270,7 @@ 
 		}
 
 		$logoutUrl = $urlGenerator->linkToRoute('core.login.logout');
-		$logoutUrl .= '?requesttoken=' . urlencode(\OCP\Util::callRegister());
+		$logoutUrl .= '?requesttoken='.urlencode(\OCP\Util::callRegister());
 
 		return $logoutUrl;
 	}
@@ -362,7 +362,7 @@ 
 		if ($user) {
 			return $user->getHome();
 		} else {
-			return \OC::$server->getSystemConfig()->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid;
+			return \OC::$server->getSystemConfig()->getValue('datadirectory', OC::$SERVERROOT.'/data').'/'.$uid;
 		}
 	}
 

core/Controller/WebAuthnController.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 			'preLoginNameUsedAsUserName',
 			['uid' => &$uid]
 		);
-		$this->logger->debug('Got UID: ' . $uid);
+		$this->logger->debug('Got UID: '.$uid);
 
 		$publicKeyCredentialRequestOptions = $this->webAuthnManger->startAuthentication($uid, $this->request->getServerHost());
 		$this->session->set(self::WEBAUTHN_LOGIN, json_encode($publicKeyCredentialRequestOptions));

core/templates/loginflow/grant.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	<h2><?php p($l->t('Account access')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+			'<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>',
 			\OCP\Util::sanitizeHTML($_['instanceName'])
 		])) ?>
 	</p>