nextcloud / server

core/Command/Config/System/DeleteConfig.php

Spacing +5 added lines, -5 removed lines

@@ -66,7 +66,7 @@ 
 
 		if (count($configNames) > 1) {
 			if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
-				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
+				$output->writeln('<error>System config '.implode(' => ', $configNames).' could not be deleted because it did not exist</error>');
 				return 1;
 			}
 
@@ -76,21 +76,21 @@ 
 				$value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists'));
 			}
 			catch (\UnexpectedValueException $e) {
-				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
+				$output->writeln('<error>System config '.implode(' => ', $configNames).' could not be deleted because it did not exist</error>');
 				return 1;
 			}
 
 			$this->systemConfig->setValue($configName, $value);
-			$output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' deleted</info>');
+			$output->writeln('<info>System config value '.implode(' => ', $configNames).' deleted</info>');
 			return 0;
 		} else {
 			if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
-				$output->writeln('<error>System config ' . $configName . ' could not be deleted because it did not exist</error>');
+				$output->writeln('<error>System config '.$configName.' could not be deleted because it did not exist</error>');
 				return 1;
 			}
 
 			$this->systemConfig->deleteValue($configName);
-			$output->writeln('<info>System config value ' . $configName . ' deleted</info>');
+			$output->writeln('<info>System config value '.$configName.' deleted</info>');
 			return 0;
 		}
 	}

core/Command/L10n/CreateJs.php

Spacing +7 added lines, -7 removed lines

@@ -63,10 +63,10 @@ 
 		}
 		$languages = $lang;
 		if (empty($lang)) {
-			$languages= $this->getAllLanguages($path);
+			$languages = $this->getAllLanguages($path);
 		}
 
-		foreach($languages as $lang) {
+		foreach ($languages as $lang) {
 			$this->writeFiles($app, $path, $lang, $output);
 		}
 	}
@@ -74,16 +74,16 @@ 
 	private function getAllLanguages($path) {
 		$result = array();
 		foreach (new DirectoryIterator("$path/l10n") as $fileInfo) {
-			if($fileInfo->isDot()) {
+			if ($fileInfo->isDot()) {
 				continue;
 			}
-			if($fileInfo->isDir()) {
+			if ($fileInfo->isDir()) {
 				continue;
 			}
-			if($fileInfo->getExtension() !== 'php') {
+			if ($fileInfo->getExtension() !== 'php') {
 				continue;
 			}
-			$result[]= substr($fileInfo->getBasename(), 0, -4);
+			$result[] = substr($fileInfo->getBasename(), 0, -4);
 		}
 
 		return $result;
@@ -105,7 +105,7 @@ 
 		$jsTrans = array();
 		foreach ($translations as $id => $val) {
 			if (is_array($val)) {
-				$val = '[ ' . implode(',', $val) . ']';
+				$val = '[ '.implode(',', $val).']';
 			}
 			$jsTrans[] = "\"$id\" : \"$val\"";
 		}

apps/encryption/lib/Crypto/Crypt.php

Spacing +19 added lines, -19 removed lines

@@ -118,7 +118,7 @@ 
 				['app' => 'encryption']);
 
 			if (openssl_error_string()) {
-				$log->error('Encryption library openssl_pkey_new() fails: ' . openssl_error_string(),
+				$log->error('Encryption library openssl_pkey_new() fails: '.openssl_error_string(),
 					['app' => 'encryption']);
 			}
 		} elseif (openssl_pkey_export($res,
@@ -133,10 +133,10 @@ 
 				'privateKey' => $privateKey
 			];
 		}
-		$log->error('Encryption library couldn\'t export users private key, please check your servers OpenSSL configuration.' . $this->user,
+		$log->error('Encryption library couldn\'t export users private key, please check your servers OpenSSL configuration.'.$this->user,
 			['app' => 'encryption']);
 		if (openssl_error_string()) {
-			$log->error('Encryption Library:' . openssl_error_string(),
+			$log->error('Encryption Library:'.openssl_error_string(),
 				['app' => 'encryption']);
 		}
 
@@ -209,15 +209,15 @@ 
 	public function generateHeader($keyFormat = 'hash') {
 
 		if (in_array($keyFormat, $this->supportedKeyFormats, true) === false) {
-			throw new \InvalidArgumentException('key format "' . $keyFormat . '" is not supported');
+			throw new \InvalidArgumentException('key format "'.$keyFormat.'" is not supported');
 		}
 
 		$cipher = $this->getCipher();
 
 		$header = self::HEADER_START
-			. ':cipher:' . $cipher
-			. ':keyFormat:' . $keyFormat
-			. ':' . self::HEADER_END;
+			. ':cipher:'.$cipher
+			. ':keyFormat:'.$keyFormat
+			. ':'.self::HEADER_END;
 
 		return $header;
 	}
@@ -239,7 +239,7 @@ 
 
 		if (!$encryptedContent) {
 			$error = 'Encryption (symmetric) of content failed';
-			$this->logger->error($error . openssl_error_string(),
+			$this->logger->error($error.openssl_error_string(),
 				['app' => 'encryption']);
 			throw new EncryptionFailedException($error);
 		}
@@ -267,8 +267,8 @@ 
 		}
 
 		// Workaround for OpenSSL 0.9.8. Fallback to an old cipher that should work.
-		if(OPENSSL_VERSION_NUMBER < 0x1000101f) {
-			if($cipher === 'AES-256-CTR' || $cipher === 'AES-128-CTR') {
+		if (OPENSSL_VERSION_NUMBER < 0x1000101f) {
+			if ($cipher === 'AES-256-CTR' || $cipher === 'AES-128-CTR') {
 				$cipher = self::LEGACY_CIPHER;
 			}
 		}
@@ -284,7 +284,7 @@ 
 	 * @throws \InvalidArgumentException
 	 */
 	protected function getKeySize($cipher) {
-		if(isset($this->supportedCiphersAndKeySize[$cipher])) {
+		if (isset($this->supportedCiphersAndKeySize[$cipher])) {
 			return $this->supportedCiphersAndKeySize[$cipher];
 		}
 
@@ -311,7 +311,7 @@ 
 	 * @return string
 	 */
 	private function concatIV($encryptedContent, $iv) {
-		return $encryptedContent . '00iv00' . $iv;
+		return $encryptedContent.'00iv00'.$iv;
 	}
 
 	/**
@@ -320,7 +320,7 @@ 
 	 * @return string
 	 */
 	private function concatSig($encryptedContent, $signature) {
-		return $encryptedContent . '00sig00' . $signature;
+		return $encryptedContent.'00sig00'.$signature;
 	}
 
 	/**
@@ -332,7 +332,7 @@ 
 	 * @return string
 	 */
 	private function addPadding($data) {
-		return $data . 'xxx';
+		return $data.'xxx';
 	}
 
 	/**
@@ -346,7 +346,7 @@ 
 	protected function generatePasswordHash($password, $cipher, $uid = '') {
 		$instanceId = $this->config->getSystemValue('instanceid');
 		$instanceSecret = $this->config->getSystemValue('secret');
-		$salt = hash('sha256', $uid . $instanceId . $instanceSecret, true);
+		$salt = hash('sha256', $uid.$instanceId.$instanceSecret, true);
 		$keySize = $this->getKeySize($cipher);
 
 		$hash = hash_pbkdf2(
@@ -492,7 +492,7 @@ 
 	 * @return string
 	 */
 	private function createSignature($data, $passPhrase) {
-		$passPhrase = hash('sha512', $passPhrase . 'a', true);
+		$passPhrase = hash('sha512', $passPhrase.'a', true);
 		return hash_hmac('sha256', $data, $passPhrase);
 	}
 
@@ -583,7 +583,7 @@ 
 		if ($plainContent) {
 			return $plainContent;
 		} else {
-			throw new DecryptionFailedException('Encryption library: Decryption (symmetric) of content failed: ' . openssl_error_string());
+			throw new DecryptionFailedException('Encryption library: Decryption (symmetric) of content failed: '.openssl_error_string());
 		}
 	}
 
@@ -649,7 +649,7 @@ 
 		if (openssl_open($encKeyFile, $plainContent, $shareKey, $privateKey)) {
 			return $plainContent;
 		} else {
-			throw new MultiKeyDecryptException('multikeydecrypt with share key failed:' . openssl_error_string());
+			throw new MultiKeyDecryptException('multikeydecrypt with share key failed:'.openssl_error_string());
 		}
 	}
 
@@ -685,7 +685,7 @@ 
 				'data' => $sealed
 			];
 		} else {
-			throw new MultiKeyEncryptException('multikeyencryption failed ' . openssl_error_string());
+			throw new MultiKeyEncryptException('multikeyencryption failed '.openssl_error_string());
 		}
 	}
 }

apps/comments/lib/Activity/Listener.php

Spacing +3 added lines, -3 removed lines

@@ -84,7 +84,7 @@ 
 
 		// Get all mount point owners
 		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
+		$mounts = $cache->getMountsForFileId((int) $event->getComment()->getObjectId());
 		if (empty($mounts)) {
 			return;
 		}
@@ -93,7 +93,7 @@ 
 		foreach ($mounts as $mount) {
 			$owner = $mount->getUser()->getUID();
 			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
+			$nodes = $ownerFolder->getById((int) $event->getComment()->getObjectId());
 			if (!empty($nodes)) {
 				/** @var Node $node */
 				$node = array_shift($nodes);
@@ -121,7 +121,7 @@ 
 		foreach ($users as $user => $path) {
 			// numerical user ids end up as integers from array keys, but string
 			// is required
-			$activity->setAffectedUser((string)$user);
+			$activity->setAffectedUser((string) $user);
 
 			$activity->setSubject('add_comment_subject', [
 				'actor' => $actor,

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*%'",
 			array($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/App/CodeChecker/InfoChecker.php

Spacing +4 added lines, -4 removed lines

@@ -47,13 +47,13 @@ 
 		}
 
 		$xml = new \DOMDocument();
-		$xml->load($appPath . '/appinfo/info.xml');
+		$xml->load($appPath.'/appinfo/info.xml');
 
-		$schema = \OC::$SERVERROOT . '/resources/app-info.xsd';
+		$schema = \OC::$SERVERROOT.'/resources/app-info.xsd';
 		try {
 			if ($this->isShipped($appId)) {
 				// Shipped apps are allowed to have the public and default_enabled tags
-				$schema = \OC::$SERVERROOT . '/resources/app-info-shipped.xsd';
+				$schema = \OC::$SERVERROOT.'/resources/app-info-shipped.xsd';
 			}
 		} catch (\Exception $e) {
 			// Assume it is not shipped
@@ -98,7 +98,7 @@ 
 	 */
 	protected function loadShippedJson() {
 		if ($this->shippedApps === null) {
-			$shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
+			$shippedJson = \OC::$SERVERROOT.'/core/shipped.json';
 			if (!file_exists($shippedJson)) {
 				throw new \Exception("File not found: $shippedJson");
 			}

core/Command/App/Install.php

Spacing +7 added lines, -7 removed lines

@@ -53,7 +53,7 @@ 
 		$appId = $input->getArgument('app-id');
 
 		if (\OC_App::getAppPath($appId)) {
-			$output->writeln($appId . ' already installed');
+			$output->writeln($appId.' already installed');
 			return 1;
 		}
 
@@ -61,22 +61,22 @@ 
 			$installer = \OC::$server->query(Installer::class);
 			$installer->downloadApp($appId);
 			$result = $installer->installApp($appId);
-		} catch(\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
+		} catch (\Exception $e) {
+			$output->writeln('Error: '.$e->getMessage());
 			return 1;
 		}
 
-		if($result === false) {
-			$output->writeln($appId . ' couldn\'t be installed');
+		if ($result === false) {
+			$output->writeln($appId.' couldn\'t be installed');
 			return 1;
 		}
 
-		$output->writeln($appId . ' installed');
+		$output->writeln($appId.' installed');
 
 		if (!$input->getOption('keep-disabled')) {
 			$appClass = new \OC_App();
 			$appClass->enable($appId);
-			$output->writeln($appId . ' enabled');
+			$output->writeln($appId.' enabled');
 		}
 
 		return 0;

apps/files_external/lib/Config/ConfigAdapter.php

Spacing +4 added lines, -4 removed lines

@@ -141,12 +141,12 @@ 
 			return $storage->getId();
 		}, $storages));
 
-		$availableStorages = array_map(function (Storage\IStorage $storage, StorageConfig $storageConfig) {
+		$availableStorages = array_map(function(Storage\IStorage $storage, StorageConfig $storageConfig) {
 			try {
 				$availability = $storage->getAvailability();
 				if (!$availability['available'] && !Availability::shouldRecheck($availability)) {
 					$storage = new FailedStorage([
-						'exception' => new StorageNotAvailableException('Storage with mount id ' . $storageConfig->getId() . ' is not available')
+						'exception' => new StorageNotAvailableException('Storage with mount id '.$storageConfig->getId().' is not available')
 					]);
 				}
 			} catch (\Exception $e) {
@@ -162,7 +162,7 @@ 
 					$this->userStoragesService,
 					$storageConfig->getId(),
 					$storage,
-					'/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
+					'/'.$user->getUID().'/files'.$storageConfig->getMountPoint(),
 					null,
 					$loader,
 					$storageConfig->getMountOptions()
@@ -170,7 +170,7 @@ 
 			} else {
 				return new ExternalMountPoint(
 					$storage,
-					'/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
+					'/'.$user->getUID().'/files'.$storageConfig->getMountPoint(),
 					null,
 					$loader,
 					$storageConfig->getMountOptions(),

apps/user_ldap/templates/part.wizard-userfilter.php

Spacing +12 added lines, -12 removed lines

@@ -1,11 +1,11 @@ 
 <fieldset id="ldapWizard2">
 	<div>
 		<p>
-			<?php p($l->t('Listing and searching for users is constrained by these criteria:'));?>
+			<?php p($l->t('Listing and searching for users is constrained by these criteria:')); ?>
 		</p>
 		<p>
 			<label for="ldap_userfilter_objectclass">
-				<?php p($l->t('Only these object classes:'));?>
+				<?php p($l->t('Only these object classes:')); ?>
 			</label>
 
 			<select id="ldap_userfilter_objectclass" multiple="multiple"
@@ -14,14 +14,14 @@ 
 		</p>
 		<p>
 			<label></label>
-			<span class="ldapInputColElement"><?php p($l->t('The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.'));?></span>
+			<span class="ldapInputColElement"><?php p($l->t('The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.')); ?></span>
 		</p>
 		<p>
 			<label for="ldap_userfilter_groups">
-				<?php p($l->t('Only from these groups:'));?>
+				<?php p($l->t('Only from these groups:')); ?>
 			</label>
 
-			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups'));?>" />
+			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups')); ?>" />
 
 			<select id="ldap_userfilter_groups" multiple="multiple"
 			 name="ldap_userfilter_groups" class="multiSelectPlugin">
@@ -30,26 +30,26 @@ 
 		<p class="ldapManyGroupsSupport hidden">
 			<label></label>
 			<select class="ldapGroupList ldapGroupListAvailable" multiple="multiple"
-					title="<?php p($l->t('Available groups'));?>"></select>
+					title="<?php p($l->t('Available groups')); ?>"></select>
 			<span class="buttonSpan">
 				<button class="ldapGroupListSelect" type="button">&gt;</button><br/>
 				<button class="ldapGroupListDeselect" type="button">&lt;</button>
 			</span>
 			<select class="ldapGroupList ldapGroupListSelected" multiple="multiple"
-					title="<?php p($l->t('Selected groups'));?>"></select>
+					title="<?php p($l->t('Selected groups')); ?>"></select>
 		</p>
 		<p>
-			<label><a id='toggleRawUserFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
+			<label><a id='toggleRawUserFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query')); ?></a></label>
 		</p>
 		<p id="ldapReadOnlyUserFilterContainer" class="hidden ldapReadOnlyFilterContainer">
-			<label><?php p($l->t('LDAP Filter:'));?></label>
+			<label><?php p($l->t('LDAP Filter:')); ?></label>
 			<span class="ldapFilterReadOnlyElement ldapInputColElement"></span>
 		</p>
 		<p id="rawUserFilterContainer">
 			<textarea type="text" id="ldap_userlist_filter" name="ldap_userlist_filter"
 				class="ldapFilterInputElement"
-				placeholder="<?php p($l->t('Edit LDAP Query'));?>"
-				title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', [$theme->getName()]));?>">
+				placeholder="<?php p($l->t('Edit LDAP Query')); ?>"
+				title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', [$theme->getName()])); ?>">
 			</textarea>
 		</p>
 		<p>
@@ -57,7 +57,7 @@ 
 		</p>
 		<p class="ldap_count">
 			<button class="ldapGetEntryCount ldapGetUserCount" name="ldapGetEntryCount" type="button">
-				<?php p($l->t('Verify settings and count users'));?>
+				<?php p($l->t('Verify settings and count users')); ?>
 			</button>
 			<span id="ldap_user_count"></span>
 		</p>