nextcloud / server

apps/files_trashbin/lib/Expiration.php

Spacing +5 added lines, -5 removed lines

@@ -51,7 +51,7 @@ 
 	/** @var bool */
 	private $canPurgeToSaveSpace;
 
-	public function __construct(IConfig $config,ITimeFactory $timeFactory) {
+	public function __construct(IConfig $config, ITimeFactory $timeFactory) {
 		$this->timeFactory = $timeFactory;
 		$this->setRetentionObligation($config->getSystemValue('trashbin_retention_obligation', 'auto'));
 	}
@@ -150,13 +150,13 @@ 
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue !== 'auto' && $maxValue === 'auto') {
 			// Keep for X days but delete anytime if space needed
-			$this->minAge = (int)$minValue;
+			$this->minAge = (int) $minValue;
 			$this->maxAge = self::NO_OBLIGATION;
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue === 'auto' && $maxValue !== 'auto') {
 			// Delete anytime if space needed, Delete all older than max automatically
 			$this->minAge = self::NO_OBLIGATION;
-			$this->maxAge = (int)$maxValue;
+			$this->maxAge = (int) $maxValue;
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
 			// Delete all older than max OR older than min if space needed
@@ -166,8 +166,8 @@ 
 				$maxValue = $minValue;
 			}
 
-			$this->minAge = (int)$minValue;
-			$this->maxAge = (int)$maxValue;
+			$this->minAge = (int) $minValue;
+			$this->maxAge = (int) $maxValue;
 			$this->canPurgeToSaveSpace = false;
 		}
 	}

apps/systemtags/lib/Activity/Listener.php

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
 		$activity->setApp('systemtags')
 			->setType('systemtags')
 			->setAuthor($actor)
-			->setObject('systemtag', (int)$tag->getId(), $tag->getName());
+			->setObject('systemtag', (int) $tag->getId(), $tag->getName());
 		if ($event->getEvent() === ManagerEvent::EVENT_CREATE) {
 			$activity->setSubject(Provider::CREATE_TAG, [
 				$actor,
@@ -204,7 +204,7 @@ 
 			->setObject($event->getObjectType(), (int) $event->getObjectId());
 
 		foreach ($users as $user => $path) {
-			$user = (string)$user; // numerical ids could be ints which are not accepted everywhere
+			$user = (string) $user; // numerical ids could be ints which are not accepted everywhere
 			$activity->setAffectedUser($user);
 
 			foreach ($tags as $tag) {

apps/encryption/lib/KeyManager.php

Spacing +22 added lines, -22 removed lines

@@ -140,7 +140,7 @@ 
 		$this->recoveryKeyId = $this->config->getAppValue('encryption',
 			'recoveryKeyId');
 		if (empty($this->recoveryKeyId)) {
-			$this->recoveryKeyId = 'recoveryKey_' . substr(md5(time()), 0, 8);
+			$this->recoveryKeyId = 'recoveryKey_'.substr(md5(time()), 0, 8);
 			$this->config->setAppValue('encryption',
 				'recoveryKeyId',
 				$this->recoveryKeyId);
@@ -149,14 +149,14 @@ 
 		$this->publicShareKeyId = $this->config->getAppValue('encryption',
 			'publicShareKeyId');
 		if (empty($this->publicShareKeyId)) {
-			$this->publicShareKeyId = 'pubShare_' . substr(md5(time()), 0, 8);
+			$this->publicShareKeyId = 'pubShare_'.substr(md5(time()), 0, 8);
 			$this->config->setAppValue('encryption', 'publicShareKeyId', $this->publicShareKeyId);
 		}
 
 		$this->masterKeyId = $this->config->getAppValue('encryption',
 			'masterKeyId');
 		if (empty($this->masterKeyId)) {
-			$this->masterKeyId = 'master_' . substr(md5(time()), 0, 8);
+			$this->masterKeyId = 'master_'.substr(md5(time()), 0, 8);
 			$this->config->setAppValue('encryption', 'masterKeyId', $this->masterKeyId);
 		}
 
@@ -176,13 +176,13 @@ 
 
 				// Save public key
 				$this->keyStorage->setSystemUserKey(
-					$this->publicShareKeyId . '.' . $this->publicKeyId, $keyPair['publicKey'],
+					$this->publicShareKeyId.'.'.$this->publicKeyId, $keyPair['publicKey'],
 					Encryption::ID);
 
 				// Encrypt private key empty passphrase
 				$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], '');
 				$header = $this->crypt->generateHeader();
-				$this->setSystemPrivateKey($this->publicShareKeyId, $header . $encryptedKey);
+				$this->setSystemPrivateKey($this->publicShareKeyId, $header.$encryptedKey);
 			} catch (\Throwable $e) {
 				$this->lockingProvider->releaseLock('encryption-generateSharedKey', ILockingProvider::LOCK_EXCLUSIVE);
 				throw $e;
@@ -212,13 +212,13 @@ 
 
 				// Save public key
 				$this->keyStorage->setSystemUserKey(
-					$this->masterKeyId . '.' . $this->publicKeyId, $keyPair['publicKey'],
+					$this->masterKeyId.'.'.$this->publicKeyId, $keyPair['publicKey'],
 					Encryption::ID);
 
 				// Encrypt private key with system password
 				$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $this->getMasterKeyPassword(), $this->masterKeyId);
 				$header = $this->crypt->generateHeader();
-				$this->setSystemPrivateKey($this->masterKeyId, $header . $encryptedKey);
+				$this->setSystemPrivateKey($this->masterKeyId, $header.$encryptedKey);
 			} catch (\Throwable $e) {
 				$this->lockingProvider->releaseLock('encryption-generateMasterKey', ILockingProvider::LOCK_EXCLUSIVE);
 				throw $e;
@@ -256,7 +256,7 @@ 
 	 * @return string
 	 */
 	public function getRecoveryKey() {
-		return $this->keyStorage->getSystemUserKey($this->recoveryKeyId . '.' . $this->publicKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($this->recoveryKeyId.'.'.$this->publicKeyId, Encryption::ID);
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 	 * @return bool
 	 */
 	public function checkRecoveryPassword($password) {
-		$recoveryKey = $this->keyStorage->getSystemUserKey($this->recoveryKeyId . '.' . $this->privateKeyId, Encryption::ID);
+		$recoveryKey = $this->keyStorage->getSystemUserKey($this->recoveryKeyId.'.'.$this->privateKeyId, Encryption::ID);
 		$decryptedRecoveryKey = $this->crypt->decryptPrivateKey($recoveryKey, $password);
 
 		if ($decryptedRecoveryKey) {
@@ -297,7 +297,7 @@ 
 		$header = $this->crypt->generateHeader();
 
 		if ($encryptedKey) {
-			$this->setPrivateKey($uid, $header . $encryptedKey);
+			$this->setPrivateKey($uid, $header.$encryptedKey);
 			return true;
 		}
 		return false;
@@ -311,7 +311,7 @@ 
 	public function setRecoveryKey($password, $keyPair) {
 		// Save Public Key
 		$this->keyStorage->setSystemUserKey($this->getRecoveryKeyId().
-			'.' . $this->publicKeyId,
+			'.'.$this->publicKeyId,
 			$keyPair['publicKey'],
 			Encryption::ID);
 
@@ -319,7 +319,7 @@ 
 		$header = $this->crypt->generateHeader();
 
 		if ($encryptedKey) {
-			$this->setSystemPrivateKey($this->getRecoveryKeyId(), $header . $encryptedKey);
+			$this->setSystemPrivateKey($this->getRecoveryKeyId(), $header.$encryptedKey);
 			return true;
 		}
 		return false;
@@ -379,7 +379,7 @@ 
 	 * @return boolean
 	 */
 	public function setShareKey($path, $uid, $key) {
-		$keyId = $uid . '.' . $this->shareKeyId;
+		$keyId = $uid.'.'.$this->shareKeyId;
 		return $this->keyStorage->setFileKey($path, $keyId, $key, Encryption::ID);
 	}
 
@@ -408,7 +408,7 @@ 
 			return false;
 		} catch (\Exception $e) {
 			$this->log->logException($e, [
-				'message' => 'Could not decrypt the private key from user "' . $uid . '"" during login. Assume password change on the user back-end.',
+				'message' => 'Could not decrypt the private key from user "'.$uid.'"" during login. Assume password change on the user back-end.',
 				'level' => ILogger::WARN,
 				'app' => 'encryption',
 			]);
@@ -469,7 +469,7 @@ 
 			// use public share key for public links
 			$uid = $this->getPublicShareKeyId();
 			$shareKey = $this->getShareKey($path, $uid);
-			$privateKey = $this->keyStorage->getSystemUserKey($this->publicShareKeyId . '.' . $this->privateKeyId, Encryption::ID);
+			$privateKey = $this->keyStorage->getSystemUserKey($this->publicShareKeyId.'.'.$this->privateKeyId, Encryption::ID);
 			$privateKey = $this->crypt->decryptPrivateKey($privateKey);
 		} else {
 			$shareKey = $this->getShareKey($path, $uid);
@@ -539,7 +539,7 @@ 
 	public function deleteShareKey($path, $keyId) {
 		return $this->keyStorage->deleteFileKey(
 			$path,
-			$keyId . '.' . $this->shareKeyId,
+			$keyId.'.'.$this->shareKeyId,
 			Encryption::ID);
 	}
 
@@ -550,7 +550,7 @@ 
 	 * @return mixed
 	 */
 	public function getShareKey($path, $uid) {
-		$keyId = $uid . '.' . $this->shareKeyId;
+		$keyId = $uid.'.'.$this->shareKeyId;
 		return $this->keyStorage->getFileKey($path, $keyId, Encryption::ID);
 	}
 
@@ -612,7 +612,7 @@ 
 	 * @return string
 	 */
 	public function getPublicShareKey() {
-		return $this->keyStorage->getSystemUserKey($this->publicShareKeyId . '.' . $this->publicKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($this->publicShareKeyId.'.'.$this->publicKeyId, Encryption::ID);
 	}
 
 	/**
@@ -681,7 +681,7 @@ 
 	 * @return string returns openssl key
 	 */
 	public function getSystemPrivateKey($keyId) {
-		return $this->keyStorage->getSystemUserKey($keyId . '.' . $this->privateKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($keyId.'.'.$this->privateKeyId, Encryption::ID);
 	}
 
 	/**
@@ -691,7 +691,7 @@ 
 	 */
 	public function setSystemPrivateKey($keyId, $key) {
 		return $this->keyStorage->setSystemUserKey(
-			$keyId . '.' . $this->privateKeyId,
+			$keyId.'.'.$this->privateKeyId,
 			$key,
 			Encryption::ID);
 	}
@@ -752,7 +752,7 @@ 
 	 * @return string
 	 */
 	public function getPublicMasterKey() {
-		return $this->keyStorage->getSystemUserKey($this->masterKeyId . '.' . $this->publicKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($this->masterKeyId.'.'.$this->publicKeyId, Encryption::ID);
 	}
 
 	/**
@@ -761,6 +761,6 @@ 
 	 * @return string
 	 */
 	public function getPrivateMasterKey() {
-		return $this->keyStorage->getSystemUserKey($this->masterKeyId . '.' . $this->privateKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($this->masterKeyId.'.'.$this->privateKeyId, Encryption::ID);
 	}
 }

apps/user_ldap/ajax/getNewServerConfigPrefix.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 $serverConnections = $helper->getServerConfigurationPrefixes();
 sort($serverConnections);
 $lk = array_pop($serverConnections);
-$ln = (int)str_replace('s', '', $lk);
+$ln = (int) str_replace('s', '', $lk);
 $nk = 's'.str_pad($ln + 1, 2, '0', STR_PAD_LEFT);
 
 $resultData = ['configPrefix' => $nk];

apps/user_ldap/lib/Command/Search.php

Spacing +3 added lines, -3 removed lines

@@ -112,8 +112,8 @@ 
 		$configPrefixes = $helper->getServerConfigurationPrefixes(true);
 		$ldapWrapper = new LDAP();
 
-		$offset = (int)$input->getOption('offset');
-		$limit = (int)$input->getOption('limit');
+		$offset = (int) $input->getOption('offset');
+		$limit = (int) $input->getOption('limit');
 		$this->validateOffsetAndLimit($offset, $limit);
 
 		if ($input->getOption('group')) {
@@ -140,7 +140,7 @@ 
 
 		$result = $proxy->$getMethod($input->getArgument('search'), $limit, $offset);
 		foreach ($result as $id => $name) {
-			$line = $name . ($printID ? ' ('.$id.')' : '');
+			$line = $name.($printID ? ' ('.$id.')' : '');
 			$output->writeln($line);
 		}
 		return 0;

apps/twofactor_backupcodes/lib/BackgroundJob/RememberBackupCodesJob.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 		}
 
 		$providers = $this->registry->getProviderStates($user);
-		$state2fa = array_reduce($providers, function (bool $carry, bool $state) {
+		$state2fa = array_reduce($providers, function(bool $carry, bool $state) {
 			return $carry || $state;
 		}, false);
 

apps/files_external/lib/Lib/Storage/SFTP.php

Spacing +14 added lines, -14 removed lines

@@ -66,7 +66,7 @@ 
 		$input = $host;
 		if (strpos($host, '://') === false) {
 			// add a protocol to fix parse_url behavior with ipv6
-			$host = 'http://' . $host;
+			$host = 'http://'.$host;
 		}
 
 		$parsed = parse_url($host);
@@ -110,8 +110,8 @@ 
 		$this->root
 			= isset($params['root']) ? $this->cleanPath($params['root']) : '/';
 
-		$this->root = '/' . ltrim($this->root, '/');
-		$this->root = rtrim($this->root, '/') . '/';
+		$this->root = '/'.ltrim($this->root, '/');
+		$this->root = rtrim($this->root, '/').'/';
 	}
 
 	/**
@@ -170,14 +170,14 @@ 
 	 * {@inheritdoc}
 	 */
 	public function getId() {
-		$id = 'sftp::' . $this->user . '@' . $this->host;
+		$id = 'sftp::'.$this->user.'@'.$this->host;
 		if ($this->port !== 22) {
-			$id .= ':' . $this->port;
+			$id .= ':'.$this->port;
 		}
 		// note: this will double the root slash,
 		// we should not change it to keep compatible with
 		// old storage ids
-		$id .= '/' . $this->root;
+		$id .= '/'.$this->root;
 		return $id;
 	}
 
@@ -207,7 +207,7 @@ 
 	 * @return string
 	 */
 	private function absPath($path) {
-		return $this->root . $this->cleanPath($path);
+		return $this->root.$this->cleanPath($path);
 	}
 
 	/**
@@ -217,8 +217,8 @@ 
 		try {
 			$storage_view = \OCP\Files::getStorage('files_external');
 			if ($storage_view) {
-				return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') .
-					$storage_view->getAbsolutePath('') .
+				return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').
+					$storage_view->getAbsolutePath('').
 					'ssh_hostKeys';
 			}
 		} catch (\Exception $e) {
@@ -236,7 +236,7 @@ 
 			if ($keyPath && file_exists($keyPath)) {
 				$fp = fopen($keyPath, 'w');
 				foreach ($keys as $host => $key) {
-					fwrite($fp, $host . '::' . $key . "\n");
+					fwrite($fp, $host.'::'.$key."\n");
 				}
 				fclose($fp);
 				return true;
@@ -308,7 +308,7 @@ 
 				return false;
 			}
 
-			$id = md5('sftp:' . $path);
+			$id = md5('sftp:'.$path);
 			$dirStream = [];
 			foreach ($list as $file) {
 				if ($file !== '.' && $file !== '..') {
@@ -375,13 +375,13 @@ 
 					}
 					SFTPReadStream::register();
 					$context = stream_context_create(['sftp' => ['session' => $this->getConnection()]]);
-					$handle = fopen('sftpread://' . trim($absPath, '/'), 'r', false, $context);
+					$handle = fopen('sftpread://'.trim($absPath, '/'), 'r', false, $context);
 					return RetryWrapper::wrap($handle);
 				case 'w':
 				case 'wb':
 					SFTPWriteStream::register();
 					$context = stream_context_create(['sftp' => ['session' => $this->getConnection()]]);
-					return fopen('sftpwrite://' . trim($absPath, '/'), 'w', false, $context);
+					return fopen('sftpwrite://'.trim($absPath, '/'), 'w', false, $context);
 				case 'a':
 				case 'ab':
 				case 'r+':
@@ -470,7 +470,7 @@ 
 		// Do not pass the password here. We want to use the Net_SFTP object
 		// supplied via stream context or fail. We only supply username and
 		// hostname because this might show up in logs (they are not used).
-		$url = 'sftp://' . urlencode($this->user) . '@' . $this->host . ':' . $this->port . $this->root . $path;
+		$url = 'sftp://'.urlencode($this->user).'@'.$this->host.':'.$this->port.$this->root.$path;
 		return $url;
 	}
 }

apps/files/lib/AppInfo/Application.php

Spacing +5 added lines, -5 removed lines

@@ -77,7 +77,7 @@ 
 		/**
 		 * Controllers
 		 */
-		$context->registerService('APIController', function (ContainerInterface $c) {
+		$context->registerService('APIController', function(ContainerInterface $c) {
 			/** @var IServerContainer $server */
 			$server = $c->get(IServerContainer::class);
 
@@ -96,7 +96,7 @@ 
 		/**
 		 * Services
 		 */
-		$context->registerService(TagService::class, function (ContainerInterface $c) {
+		$context->registerService(TagService::class, function(ContainerInterface $c) {
 			/** @var IServerContainer $server */
 			$server = $c->get(IServerContainer::class);
 
@@ -150,7 +150,7 @@ 
 	}
 
 	private function registerNavigation(IL10N $l10n): void {
-		\OCA\Files\App::getNavigationManager()->add(function () use ($l10n) {
+		\OCA\Files\App::getNavigationManager()->add(function() use ($l10n) {
 			return [
 				'id' => 'files',
 				'appname' => 'files',
@@ -159,7 +159,7 @@ 
 				'name' => $l10n->t('All files')
 			];
 		});
-		\OCA\Files\App::getNavigationManager()->add(function () use ($l10n) {
+		\OCA\Files\App::getNavigationManager()->add(function() use ($l10n) {
 			return [
 				'id' => 'recent',
 				'appname' => 'files',
@@ -168,7 +168,7 @@ 
 				'name' => $l10n->t('Recent')
 			];
 		});
-		\OCA\Files\App::getNavigationManager()->add(function () use ($l10n) {
+		\OCA\Files\App::getNavigationManager()->add(function() use ($l10n) {
 			return [
 				'id' => 'favorites',
 				'appname' => 'files',

apps/user_status/lib/Controller/StatusesController.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	public function findAll(?int $limit = null, ?int $offset = null): DataResponse {
 		$allStatuses = $this->service->findAll($limit, $offset);
 
-		return new DataResponse(array_map(function ($userStatus) {
+		return new DataResponse(array_map(function($userStatus) {
 			return $this->formatStatus($userStatus);
 		}, $allStatuses));
 	}