nextcloud / server

core/Command/Db/Migrations/StatusCommand.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
 		$infos = $this->getMigrationsInfos($ms);
 		foreach ($infos as $key => $value) {
-			$output->writeln("    <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value);
+			$output->writeln("    <comment>>></comment> $key: ".str_repeat(' ', 50 - strlen($key)).$value);
 		}
 	}
 

lib/private/DB/OracleConnection.php

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
 	private function quoteKeys(array $data) {
 		$return = [];
 		$c = $this->getDatabasePlatform()->getIdentifierQuoteCharacter();
-		foreach($data as $key => $value) {
+		foreach ($data as $key => $value) {
 			if ($key[0] !== $c) {
 				$return[$this->quoteIdentifier($key)] = $value;
 			} else {
@@ -82,10 +82,10 @@ 
 	 * @param string $table table name without the prefix
 	 */
 	public function dropTable($table) {
-		$table = $this->tablePrefix . trim($table);
+		$table = $this->tablePrefix.trim($table);
 		$table = $this->quoteIdentifier($table);
 		$schema = $this->getSchemaManager();
-		if($schema->tablesExist(array($table))) {
+		if ($schema->tablesExist(array($table))) {
 			$schema->dropTable($table);
 		}
 	}
@@ -96,8 +96,8 @@ 
 	 * @param string $table table name without the prefix
 	 * @return bool
 	 */
-	public function tableExists($table){
-		$table = $this->tablePrefix . trim($table);
+	public function tableExists($table) {
+		$table = $this->tablePrefix.trim($table);
 		$table = $this->quoteIdentifier($table);
 		$schema = $this->getSchemaManager();
 		return $schema->tablesExist(array($table));

lib/private/DB/SchemaWrapper.php

Spacing +4 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
 	 * @throws \Doctrine\DBAL\Schema\SchemaException
 	 */
 	public function getTable($tableName) {
-		return $this->schema->getTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->getTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 * @return boolean
 	 */
 	public function hasTable($tableName) {
-		return $this->schema->hasTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->hasTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 * @return \Doctrine\DBAL\Schema\Table
 	 */
 	public function createTable($tableName) {
-		return $this->schema->createTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->createTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 	 */
 	public function dropTable($tableName) {
 		$this->tablesToDelete[$tableName] = true;
-		return $this->schema->dropTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->dropTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**

apps/dav/lib/CalDAV/Calendar.php

Spacing +4 added lines, -4 removed lines

@@ -110,7 +110,7 @@ 
 	}
 
 	public function getACL() {
-		$acl =  [
+		$acl = [
 			[
 				'privilege' => '{DAV:}read',
 				'principal' => $this->getOwner(),
@@ -131,7 +131,7 @@ 
 		}
 
 		if ($this->getOwner() !== parent::getOwner()) {
-			$acl[] =  [
+			$acl[] = [
 					'privilege' => '{DAV:}read',
 					'principal' => parent::getOwner(),
 					'protected' => true,
@@ -178,7 +178,7 @@ 
 	public function delete() {
 		if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal']) &&
 			$this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri']) {
-			$principal = 'principal:' . parent::getOwner();
+			$principal = 'principal:'.parent::getOwner();
 			$shares = $this->caldavBackend->getShares($this->getResourceId());
 			$shares = array_filter($shares, function($share) use ($principal){
 				return $share['href'] === $principal;
@@ -267,7 +267,7 @@ 
 
 		$uris = $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters);
 		if ($this->isShared()) {
-			return array_filter($uris, function ($uri) {
+			return array_filter($uris, function($uri) {
 				return $this->childExists($uri);
 			});
 		}

apps/files/lib/Controller/ViewController.php

Spacing +3 added lines, -3 removed lines

@@ -109,7 +109,7 @@ 
 	protected function renderScript($appName, $scriptName) {
 		$content = '';
 		$appPath = \OC_App::getAppPath($appName);
-		$scriptPath = $appPath . '/' . $scriptName;
+		$scriptPath = $appPath.'/'.$scriptName;
 		if (file_exists($scriptPath)) {
 			// TODO: sanitize path / script name ?
 			ob_start();
@@ -204,7 +204,7 @@ 
 		$this->eventDispatcher->dispatch('OCA\Files::loadAdditionalScripts', $event);
 
 		$params = [];
-		$params['usedSpacePercent'] = (int)$storageInfo['relative'];
+		$params['usedSpacePercent'] = (int) $storageInfo['relative'];
 		$params['owner'] = $storageInfo['owner'];
 		$params['ownerDisplayName'] = $storageInfo['ownerDisplayName'];
 		$params['isPublic'] = false;
@@ -245,7 +245,7 @@ 
 		$params = [];
 
 		if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) {
-			$baseFolder = $this->rootFolder->get($uid . '/files_trashbin/files/');
+			$baseFolder = $this->rootFolder->get($uid.'/files_trashbin/files/');
 			$files = $baseFolder->getById($fileId);
 			$params['view'] = 'trashbin';
 		}

lib/private/Encryption/Util.php

Spacing +8 added lines, -8 removed lines

@@ -96,7 +96,7 @@ 
 		$this->config = $config;
 
 		$this->excludedPaths[] = 'files_encryption';
-		$this->excludedPaths[] = 'appdata_' . $config->getSystemValue('instanceid', null);
+		$this->excludedPaths[] = 'appdata_'.$config->getSystemValue('instanceid', null);
 		$this->excludedPaths[] = 'files_external';
 	}
 
@@ -136,12 +136,12 @@ 
 	 * @throws EncryptionHeaderKeyExistsException if header key is already in use
 	 */
 	public function createHeader(array $headerData, IEncryptionModule $encryptionModule) {
-		$header = self::HEADER_START . ':' . self::HEADER_ENCRYPTION_MODULE_KEY . ':' . $encryptionModule->getId() . ':';
+		$header = self::HEADER_START.':'.self::HEADER_ENCRYPTION_MODULE_KEY.':'.$encryptionModule->getId().':';
 		foreach ($headerData as $key => $value) {
 			if (in_array($key, $this->ocHeaderKeys)) {
 				throw new EncryptionHeaderKeyExistsException($key);
 			}
-			$header .= $key . ':' . $value . ':';
+			$header .= $key.':'.$value.':';
 		}
 		$header .= self::HEADER_END;
 
@@ -172,7 +172,7 @@ 
 				if ($c->getType() === 'dir') {
 					$dirList[] = $c->getPath();
 				} else {
-					$result[] =  $c->getPath();
+					$result[] = $c->getPath();
 				}
 			}
 
@@ -249,15 +249,15 @@ 
 	public function stripPartialFileExtension($path) {
 		$extension = pathinfo($path, PATHINFO_EXTENSION);
 
-		if ( $extension === 'part') {
+		if ($extension === 'part') {
 
 			$newLength = strlen($path) - 5; // 5 = strlen(".part")
 			$fPath = substr($path, 0, $newLength);
 
 			// if path also contains a transaction id, we remove it too
 			$extension = pathinfo($fPath, PATHINFO_EXTENSION);
-			if(substr($extension, 0, 12) === 'ocTransferId') { // 12 = strlen("ocTransferId")
-				$newLength = strlen($fPath) - strlen($extension) -1;
+			if (substr($extension, 0, 12) === 'ocTransferId') { // 12 = strlen("ocTransferId")
+				$newLength = strlen($fPath) - strlen($extension) - 1;
 				$fPath = substr($fPath, 0, $newLength);
 			}
 			return $fPath;
@@ -301,7 +301,7 @@ 
 		if (\OCP\App::isEnabled("files_external")) {
 			$mounts = \OC_Mount_Config::getSystemMountPoints();
 			foreach ($mounts as $mount) {
-				if (strpos($path, '/files/' . $mount['mountpoint']) === 0) {
+				if (strpos($path, '/files/'.$mount['mountpoint']) === 0) {
 					if ($this->isMountPointApplicableToUser($mount, $uid)) {
 						return true;
 					}

apps/files_sharing/lib/External/Manager.php

Spacing +14 added lines, -14 removed lines

@@ -114,18 +114,18 @@ 
 	 * @param int $remoteId
 	 * @return Mount|null
 	 */
-	public function addShare($remote, $token, $password, $name, $owner, $accepted=false, $user = null, $remoteId = -1) {
+	public function addShare($remote, $token, $password, $name, $owner, $accepted = false, $user = null, $remoteId = -1) {
 
 		$user = $user ? $user : $this->uid;
 		$accepted = $accepted ? 1 : 0;
-		$name = Filesystem::normalizePath('/' . $name);
+		$name = Filesystem::normalizePath('/'.$name);
 
 		if (!$accepted) {
 			// To avoid conflicts with the mount point generation later,
 			// we only use a temporary mount point name here. The real
 			// mount point name will be generated when accepting the share,
 			// using the original share item name.
-			$tmpMountPointName = '{{TemporaryMountPointName#' . $name . '}}';
+			$tmpMountPointName = '{{TemporaryMountPointName#'.$name.'}}';
 			$mountPoint = $tmpMountPointName;
 			$hash = md5($tmpMountPointName);
 			$data = [
@@ -144,7 +144,7 @@ 
 			$i = 1;
 			while (!$this->connection->insertIfNotExist('*PREFIX*share_external', $data, ['user', 'mountpoint_hash'])) {
 				// The external share already exists for the user
-				$data['mountpoint'] = $tmpMountPointName . '-' . $i;
+				$data['mountpoint'] = $tmpMountPointName.'-'.$i;
 				$data['mountpoint_hash'] = md5($data['mountpoint']);
 				$i++;
 			}
@@ -152,7 +152,7 @@ 
 		}
 
 		$mountPoint = Files::buildNotExistingFileName('/', $name);
-		$mountPoint = Filesystem::normalizePath('/' . $mountPoint);
+		$mountPoint = Filesystem::normalizePath('/'.$mountPoint);
 		$hash = md5($mountPoint);
 
 		$query = $this->connection->prepare('
@@ -271,7 +271,7 @@ 
 		$federationEndpoints = $this->discoveryService->discover($remote, 'FEDERATED_SHARING');
 		$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
 
-		$url = rtrim($remote, '/') . $endpoint . '/' . $remoteId . '/' . $feedback . '?format=' . \OCP\Share::RESPONSE_FORMAT;
+		$url = rtrim($remote, '/').$endpoint.'/'.$remoteId.'/'.$feedback.'?format='.\OCP\Share::RESPONSE_FORMAT;
 		$fields = array('token' => $token);
 
 		$client = $this->clientService->newClient();
@@ -300,13 +300,13 @@ 
 	 * @return string
 	 */
 	protected function stripPath($path) {
-		$prefix = '/' . $this->uid . '/files';
+		$prefix = '/'.$this->uid.'/files';
 		return rtrim(substr($path, strlen($prefix)), '/');
 	}
 
 	public function getMount($data) {
 		$data['manager'] = $this;
-		$mountPoint = '/' . $this->uid . '/files' . $data['mountpoint'];
+		$mountPoint = '/'.$this->uid.'/files'.$data['mountpoint'];
 		$data['mountpoint'] = $mountPoint;
 		$data['certificateManager'] = \OC::$server->getCertificateManager($this->uid);
 		return new Mount(self::STORAGE, $mountPoint, $data, $this, $this->storageLoader);
@@ -346,7 +346,7 @@ 
 			WHERE `mountpoint_hash` = ?
 			AND `user` = ?
 		');
-		$result = (bool)$query->execute(array($target, $targetHash, $sourceHash, $this->uid));
+		$result = (bool) $query->execute(array($target, $targetHash, $sourceHash, $this->uid));
 
 		return $result;
 	}
@@ -376,9 +376,9 @@ 
 			WHERE `mountpoint_hash` = ?
 			AND `user` = ?
 		');
-		$result = (bool)$query->execute(array($hash, $this->uid));
+		$result = (bool) $query->execute(array($hash, $this->uid));
 
-		if($result) {
+		if ($result) {
 			$this->removeReShares($id);
 		}
 
@@ -399,7 +399,7 @@ 
 
 
 		$query->delete('federated_reshares')
-			->where($query->expr()->in('share_id', $query->createFunction('(' . $select . ')')));
+			->where($query->expr()->in('share_id', $query->createFunction('('.$select.')')));
 		$query->execute();
 
 		$deleteReShares = $this->connection->getQueryBuilder();
@@ -423,7 +423,7 @@ 
 
 		if ($result) {
 			$shares = $getShare->fetchAll();
-			foreach($shares as $share) {
+			foreach ($shares as $share) {
 				$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
 			}
 		}
@@ -432,7 +432,7 @@ 
 			DELETE FROM `*PREFIX*share_external`
 			WHERE `user` = ?
 		');
-		return (bool)$query->execute(array($uid));
+		return (bool) $query->execute(array($uid));
 	}
 
 	/**

settings/Controller/UsersController.php

Spacing +23 added lines, -23 removed lines

@@ -362,7 +362,7 @@ 
 		if ($email !== '' && !$this->mailer->validateMailAddress($email)) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Invalid mail address')
+					'message' => (string) $this->l10n->t('Invalid mail address')
 				],
 				Http::STATUS_UNPROCESSABLE_ENTITY
 			);
@@ -398,7 +398,7 @@ 
 		if ($this->userManager->userExists($username)) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('A user with that name already exists.')
+					'message' => (string) $this->l10n->t('A user with that name already exists.')
 				],
 				Http::STATUS_CONFLICT
 			);
@@ -409,7 +409,7 @@ 
 			if ($email === '') {
 				return new DataResponse(
 					[
-						'message' => (string)$this->l10n->t('To send a password link to the user an email address is required.')
+						'message' => (string) $this->l10n->t('To send a password link to the user an email address is required.')
 					],
 					Http::STATUS_UNPROCESSABLE_ENTITY
 				);
@@ -428,7 +428,7 @@ 
 			}
 			return new DataResponse(
 				[
-					'message' => (string)$message,
+					'message' => (string) $message,
 				],
 				Http::STATUS_FORBIDDEN
 			);
@@ -454,7 +454,7 @@ 
 					$emailTemplate = $this->newUserMailHelper->generateTemplate($user, $generatePasswordResetToken);
 					$this->newUserMailHelper->sendMail($user, $emailTemplate);
 				} catch (\Exception $e) {
-					$this->log->error("Can't send new user mail to $email: " . $e->getMessage(), ['app' => 'settings']);
+					$this->log->error("Can't send new user mail to $email: ".$e->getMessage(), ['app' => 'settings']);
 				}
 			}
 			// fetch users groups
@@ -468,7 +468,7 @@ 
 
 		return new DataResponse(
 			[
-				'message' => (string)$this->l10n->t('Unable to create user.')
+				'message' => (string) $this->l10n->t('Unable to create user.')
 			],
 			Http::STATUS_FORBIDDEN
 		);
@@ -491,7 +491,7 @@ 
 				[
 					'status' => 'error',
 					'data' => [
-						'message' => (string)$this->l10n->t('Unable to delete user.')
+						'message' => (string) $this->l10n->t('Unable to delete user.')
 					]
 				],
 				Http::STATUS_FORBIDDEN
@@ -503,7 +503,7 @@ 
 				[
 					'status' => 'error',
 					'data' => [
-						'message' => (string)$this->l10n->t('Authentication error')
+						'message' => (string) $this->l10n->t('Authentication error')
 					]
 				],
 				Http::STATUS_FORBIDDEN
@@ -528,7 +528,7 @@ 
 			[
 				'status' => 'error',
 				'data' => [
-					'message' => (string)$this->l10n->t('Unable to delete user.')
+					'message' => (string) $this->l10n->t('Unable to delete user.')
 				]
 			],
 			Http::STATUS_FORBIDDEN
@@ -543,11 +543,11 @@ 
 	 * @return DataResponse
 	 */
 	public function setEnabled($id, $enabled) {
-		$enabled = (bool)$enabled;
+		$enabled = (bool) $enabled;
 		if ($enabled) {
-			$errorMsgGeneral = (string)$this->l10n->t('Error while enabling user.');
+			$errorMsgGeneral = (string) $this->l10n->t('Error while enabling user.');
 		} else {
-			$errorMsgGeneral = (string)$this->l10n->t('Error while disabling user.');
+			$errorMsgGeneral = (string) $this->l10n->t('Error while disabling user.');
 		}
 
 		$userId = $this->userSession->getUser()->getUID();
@@ -570,7 +570,7 @@ 
 					[
 						'status' => 'error',
 						'data' => [
-							'message' => (string)$this->l10n->t('Authentication error')
+							'message' => (string) $this->l10n->t('Authentication error')
 						]
 					],
 					Http::STATUS_FORBIDDEN
@@ -622,11 +622,11 @@ 
 
 		$accountData = $this->accountManager->getUser($user);
 		$cloudId = $user->getCloudId();
-		$message = "Use my Federated Cloud ID to share with me: " . $cloudId;
+		$message = "Use my Federated Cloud ID to share with me: ".$cloudId;
 		$signature = $this->signMessage($user, $message);
 
-		$code = $message . ' ' . $signature;
-		$codeMd5 = $message . ' ' . md5($signature);
+		$code = $message.' '.$signature;
+		$codeMd5 = $message.' '.md5($signature);
 
 		switch ($account) {
 			case 'verify-twitter':
@@ -731,7 +731,7 @@ 
 				[
 					'status' => 'error',
 					'data' => [
-						'message' => (string)$this->l10n->t('Invalid mail address')
+						'message' => (string) $this->l10n->t('Invalid mail address')
 					]
 				],
 				Http::STATUS_UNPROCESSABLE_ENTITY
@@ -775,7 +775,7 @@ 
 						'websiteScope' => $data[AccountManager::PROPERTY_WEBSITE]['scope'],
 						'address' => $data[AccountManager::PROPERTY_ADDRESS]['value'],
 						'addressScope' => $data[AccountManager::PROPERTY_ADDRESS]['scope'],
-						'message' => (string)$this->l10n->t('Settings saved')
+						'message' => (string) $this->l10n->t('Settings saved')
 					]
 				],
 				Http::STATUS_OK
@@ -946,7 +946,7 @@ 
 				[
 					'status' => 'error',
 					'data' => [
-						'message' => (string)$this->l10n->t('Forbidden')
+						'message' => (string) $this->l10n->t('Forbidden')
 					]
 				],
 				Http::STATUS_FORBIDDEN
@@ -958,7 +958,7 @@ 
 				[
 					'status' => 'error',
 					'data' => [
-						'message' => (string)$this->l10n->t('Invalid mail address')
+						'message' => (string) $this->l10n->t('Invalid mail address')
 					]
 				],
 				Http::STATUS_UNPROCESSABLE_ENTITY
@@ -970,7 +970,7 @@ 
 				[
 					'status' => 'error',
 					'data' => [
-						'message' => (string)$this->l10n->t('Invalid user')
+						'message' => (string) $this->l10n->t('Invalid user')
 					]
 				],
 				Http::STATUS_UNPROCESSABLE_ENTITY
@@ -983,7 +983,7 @@ 
 				[
 					'status' => 'error',
 					'data' => [
-						'message' => (string)$this->l10n->t('Unable to change mail address')
+						'message' => (string) $this->l10n->t('Unable to change mail address')
 					]
 				],
 				Http::STATUS_FORBIDDEN
@@ -1001,7 +1001,7 @@ 
 					'data' => [
 						'username' => $id,
 						'mailAddress' => $mailAddress,
-						'message' => (string)$this->l10n->t('Email saved')
+						'message' => (string) $this->l10n->t('Email saved')
 					]
 				],
 				Http::STATUS_OK

lib/private/Session/Internal.php

Spacing +2 added lines, -2 removed lines

@@ -168,12 +168,12 @@
 	 */
 	private function invoke($functionName, array $parameters = [], $silence = false) {
 		try {
-			if($silence) {
+			if ($silence) {
 				return @call_user_func_array($functionName, $parameters);
 			} else {
 				return call_user_func_array($functionName, $parameters);
 			}
-		} catch(\Error $e) {
+		} catch (\Error $e) {
 			$this->trapError($e->getCode(), $e->getMessage());
 		}
 	}