nextcloud / server

lib/private/Encryption/DecryptAll.php

Spacing +9 added lines, -9 removed lines

@@ -86,7 +86,7 @@ 
 		$this->output = $output;
 
 		if ($user !== '' && $this->userManager->userExists($user) === false) {
-			$this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again');
+			$this->output->writeln('User "'.$user.'" does not exist. Please check the username and try again');
 			return false;
 		}
 
@@ -104,9 +104,9 @@ 
 			$this->output->writeln('Files for following users couldn\'t be decrypted, ');
 			$this->output->writeln('maybe the user is not set up in a way that supports this operation: ');
 			foreach ($this->failed as $uid => $paths) {
-				$this->output->writeln('    ' . $uid);
+				$this->output->writeln('    '.$uid);
 				foreach ($paths as $path) {
-					$this->output->writeln('        ' . $path);
+					$this->output->writeln('        '.$path);
 				}
 			}
 			$this->output->writeln('');
@@ -128,10 +128,10 @@ 
 			/** @var IEncryptionModule $module */
 			$module = call_user_func($moduleDesc['callback']);
 			$this->output->writeln('');
-			$this->output->writeln('Prepare "' . $module->getDisplayName() . '"');
+			$this->output->writeln('Prepare "'.$module->getDisplayName().'"');
 			$this->output->writeln('');
 			if ($module->prepareDecryptAll($this->input, $this->output, $user) === false) {
-				$this->output->writeln('Module "' . $moduleDesc['displayName'] . '" does not support the functionality to decrypt all files again or the initialization of the module failed!');
+				$this->output->writeln('Module "'.$moduleDesc['displayName'].'" does not support the functionality to decrypt all files again or the initialization of the module failed!');
 				return false;
 			}
 		}
@@ -209,16 +209,16 @@ 
 
 		$this->setupUserFS($uid);
 		$directories = array();
-		$directories[] = '/' . $uid . '/files';
+		$directories[] = '/'.$uid.'/files';
 
 		while ($root = array_pop($directories)) {
 			$content = $this->rootView->getDirectoryContent($root);
 			foreach ($content as $file) {
 				// only decrypt files owned by the user
-				if($file->getStorage()->instanceOfStorage('OCA\Files_Sharing\SharedStorage')) {
+				if ($file->getStorage()->instanceOfStorage('OCA\Files_Sharing\SharedStorage')) {
 					continue;
 				}
-				$path = $root . '/' . $file['name'];
+				$path = $root.'/'.$file['name'];
 				if ($this->rootView->is_dir($path)) {
 					$directories[] = $path;
 					continue;
@@ -262,7 +262,7 @@ 
 		}
 
 		$source = $path;
-		$target = $path . '.decrypted.' . $this->getTimestamp();
+		$target = $path.'.decrypted.'.$this->getTimestamp();
 
 		try {
 			$this->rootView->copy($source, $target);

console.php

Spacing +16 added lines, -16 removed lines

@@ -29,7 +29,7 @@ 
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 use OC\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
@@ -38,12 +38,12 @@ 
 define('OC_CONSOLE', 1);
 
 function exceptionHandler($exception) {
-	echo "An unhandled exception has been thrown:" . PHP_EOL;
+	echo "An unhandled exception has been thrown:".PHP_EOL;
 	echo $exception;
 	exit(1);
 }
 try {
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	// set to run indefinitely if needed
 	if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
@@ -51,39 +51,39 @@ 
 	}
 
 	if (!OC::$CLI) {
-		echo "This script can be run from the command line only" . PHP_EOL;
+		echo "This script can be run from the command line only".PHP_EOL;
 		exit(1);
 	}
 
 	set_exception_handler('exceptionHandler');
 
 	if (!function_exists('posix_getuid')) {
-		echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php" . PHP_EOL;
+		echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php".PHP_EOL;
 		exit(1);
 	}
 	$user = posix_getpwuid(posix_getuid());
-	$configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php'));
+	$configUser = posix_getpwuid(fileowner(OC::$configDir.'config.php'));
 	if ($user['name'] !== $configUser['name']) {
-		echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
-		echo "Current user: " . $user['name'] . PHP_EOL;
-		echo "Owner of config.php: " . $configUser['name'] . PHP_EOL;
-		echo "Try adding 'sudo -u " . $configUser['name'] . " ' to the beginning of the command (without the single quotes)" . PHP_EOL;
-		echo "If running with 'docker exec' try adding the option '-u " . $configUser['name'] . "' to the docker command (without the single quotes)" . PHP_EOL;
+		echo "Console has to be executed with the user that owns the file config/config.php".PHP_EOL;
+		echo "Current user: ".$user['name'].PHP_EOL;
+		echo "Owner of config.php: ".$configUser['name'].PHP_EOL;
+		echo "Try adding 'sudo -u ".$configUser['name']." ' to the beginning of the command (without the single quotes)".PHP_EOL;
+		echo "If running with 'docker exec' try adding the option '-u ".$configUser['name']."' to the docker command (without the single quotes)".PHP_EOL;
 		exit(1);
 	}
 
 	$oldWorkingDir = getcwd();
 	if ($oldWorkingDir === false) {
-		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
-		echo "Can't determine current working dir - the script will continue to work but be aware of the above fact." . PHP_EOL;
+		echo "This script can be run from the Nextcloud root directory only.".PHP_EOL;
+		echo "Can't determine current working dir - the script will continue to work but be aware of the above fact.".PHP_EOL;
 	} else if ($oldWorkingDir !== __DIR__ && !chdir(__DIR__)) {
-		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
-		echo "Can't change to Nextcloud root directory." . PHP_EOL;
+		echo "This script can be run from the Nextcloud root directory only.".PHP_EOL;
+		echo "Can't change to Nextcloud root directory.".PHP_EOL;
 		exit(1);
 	}
 
 	if (!function_exists('pcntl_signal') && !in_array('--no-warnings', $argv)) {
-		echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see http://php.net/manual/en/book.pcntl.php" . PHP_EOL;
+		echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see http://php.net/manual/en/book.pcntl.php".PHP_EOL;
 	}
 
 	$application = new Application(

public.php

Spacing +5 added lines, -5 removed lines

@@ -28,11 +28,11 @@ 
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 try {
 
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 	if (\OCP\Util::needUpgrade()) {
 		// since the behavior of apps or remotes are unpredictable during
 		// an upgrade, return a 503 directly
@@ -53,7 +53,7 @@ 
 		$pathInfo = trim($pathInfo, '/');
 		list($service) = explode('/', $pathInfo);
 	}
-	$file = \OC::$server->getConfig()->getAppValue('core', 'public_' . strip_tags($service));
+	$file = \OC::$server->getConfig()->getAppValue('core', 'public_'.strip_tags($service));
 	if ($file === '') {
 		http_response_code(404);
 		exit;
@@ -74,9 +74,9 @@ 
 	OC_App::loadApp($app);
 	OC_User::setIncognitoMode(true);
 
-	$baseuri = OC::$WEBROOT . '/public.php/' . $service . '/';
+	$baseuri = OC::$WEBROOT.'/public.php/'.$service.'/';
 
-	require_once OC_App::getAppPath($app) . '/' . $parts[1];
+	require_once OC_App::getAppPath($app).'/'.$parts[1];
 
 } catch (Exception $ex) {
 	$status = 500;

core/templates/loginflow/authpicker.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('Please log in before granting %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>
@@ -59,6 +59,6 @@ 
 	</form>
 </div>
 
-<?php if(empty($_['oauthState'])): ?>
+<?php if (empty($_['oauthState'])): ?>
 <a id="app-token-login" class="warning" href="#"><?php p($l->t('Alternative log in using app token')) ?></a>
 <?php endif; ?>

core/Controller/ClientFlowLoginController.php

Spacing +10 added lines, -10 removed lines

@@ -124,7 +124,7 @@ 
 	 */
 	private function isValidToken($stateToken) {
 		$currentToken = $this->session->get(self::stateName);
-		if(!is_string($stateToken) || !is_string($currentToken)) {
+		if (!is_string($stateToken) || !is_string($currentToken)) {
 			return false;
 		}
 		return hash_equals($currentToken, $stateToken);
@@ -158,7 +158,7 @@ 
 	public function showAuthPickerPage($clientIdentifier = '') {
 		$clientName = $this->getClientName();
 		$client = null;
-		if($clientIdentifier !== '') {
+		if ($clientIdentifier !== '') {
 			$client = $this->clientMapper->getByIdentifier($clientIdentifier);
 			$clientName = $client->getName();
 		}
@@ -216,13 +216,13 @@ 
 	 */
 	public function grantPage($stateToken = '',
 								 $clientIdentifier = '') {
-		if(!$this->isValidToken($stateToken)) {
+		if (!$this->isValidToken($stateToken)) {
 			return $this->stateTokenForbiddenResponse();
 		}
 
 		$clientName = $this->getClientName();
 		$client = null;
-		if($clientIdentifier !== '') {
+		if ($clientIdentifier !== '') {
 			$client = $this->clientMapper->getByIdentifier($clientIdentifier);
 			$clientName = $client->getName();
 		}
@@ -253,7 +253,7 @@ 
 	 */
 	public function generateAppPassword($stateToken,
 										$clientIdentifier = '') {
-		if(!$this->isValidToken($stateToken)) {
+		if (!$this->isValidToken($stateToken)) {
 			$this->session->remove(self::stateName);
 			return $this->stateTokenForbiddenResponse();
 		}
@@ -284,7 +284,7 @@ 
 
 		$clientName = $this->getClientName();
 		$client = false;
-		if($clientIdentifier !== '') {
+		if ($clientIdentifier !== '') {
 			$client = $this->clientMapper->getByIdentifier($clientIdentifier);
 			$clientName = $client->getName();
 		}
@@ -301,7 +301,7 @@ 
 			IToken::DO_NOT_REMEMBER
 		);
 
-		if($client) {
+		if ($client) {
 			$code = $this->random->generate(128, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
 			$accessToken = new AccessToken();
 			$accessToken->setClientId($client->getId());
@@ -318,7 +318,7 @@ 
 			);
 			$this->session->remove('oauth.state');
 		} else {
-			$redirectUri = 'nc://login/server:' . $this->getServerPath() . '&user:' . urlencode($loginName) . '&password:' . urlencode($token);
+			$redirectUri = 'nc://login/server:'.$this->getServerPath().'&user:'.urlencode($loginName).'&password:'.urlencode($token);
 
 			// Clear the token from the login here
 			$this->tokenProvider->invalidateToken($sessionId);
@@ -335,7 +335,7 @@ 
 			return $this->stateTokenForbiddenResponse();
 		}
 
-		$redirectUri = 'nc://login/server:' . $this->getServerPath() . '&user:' . urlencode($user) . '&password:' . urlencode($password);
+		$redirectUri = 'nc://login/server:'.$this->getServerPath().'&user:'.urlencode($user).'&password:'.urlencode($password);
 		return new Http\RedirectResponse($redirectUri);
 	}
 
@@ -358,6 +358,6 @@ 
 			}
 		}
 
-		return $protocol . "://" . $this->request->getServerHost() . $serverPostfix;
+		return $protocol."://".$this->request->getServerHost().$serverPostfix;
 	}
 }

apps/user_ldap/lib/User/DeletedUsersIndex.php

Spacing +5 added lines, -5 removed lines

@@ -71,7 +71,7 @@ 
 			'user_ldap', 'isDeleted', '1');
 
 		$userObjects = [];
-		foreach($deletedUsers as $user) {
+		foreach ($deletedUsers as $user) {
 			$userObjects[] = new OfflineUser($user, $this->config, $this->db, $this->mapping);
 		}
 		$this->deletedUsers = $userObjects;
@@ -84,7 +84,7 @@ 
 	 * @return \OCA\User_LDAP\User\OfflineUser[]
 	 */
 	public function getUsers() {
-		if(is_array($this->deletedUsers)) {
+		if (is_array($this->deletedUsers)) {
 			return $this->deletedUsers;
 		}
 		return $this->fetchDeletedUsers();
@@ -95,7 +95,7 @@ 
 	 * @return bool
 	 */
 	public function hasUsers() {
-		if(!is_array($this->deletedUsers)) {
+		if (!is_array($this->deletedUsers)) {
 			$this->fetchDeletedUsers();
 		}
 		return is_array($this->deletedUsers) && (count($this->deletedUsers) > 0);
@@ -109,12 +109,12 @@ 
 	 */
 	public function markUser($ocName) {
 		$curValue = $this->config->getUserValue($ocName, 'user_ldap', 'isDeleted', '0');
-		if($curValue === '1') {
+		if ($curValue === '1') {
 			// the user is already marked, do not write to DB again
 			return;
 		}
 		$this->config->setUserValue($ocName, 'user_ldap', 'isDeleted', '1');
-		$this->config->setUserValue($ocName, 'user_ldap', 'foundDeleted', (string)time());
+		$this->config->setUserValue($ocName, 'user_ldap', 'foundDeleted', (string) time());
 		$this->deletedUsers = null;
 	}
 }

apps/user_ldap/lib/User/OfflineUser.php

Spacing +5 added lines, -5 removed lines

@@ -171,7 +171,7 @@ 
 	 * @return int
 	 */
 	public function getLastLogin() {
-		return (int)$this->lastLogin;
+		return (int) $this->lastLogin;
 	}
 
 	/**
@@ -179,7 +179,7 @@ 
 	 * @return int
 	 */
 	public function getDetectedOn() {
-		return (int)$this->foundDeleted;
+		return (int) $this->foundDeleted;
 	}
 
 	/**
@@ -202,7 +202,7 @@ 
 			'email'        => 'settings',
 			'lastLogin'    => 'login',
 		];
-		foreach($properties as $property => $app) {
+		foreach ($properties as $property => $app) {
 			$this->$property = $this->config->getUserValue($this->ocName, $app, $property, '');
 		}
 
@@ -225,7 +225,7 @@ 
 		', 1);
 		$query->execute(array($this->ocName));
 		$sResult = $query->fetchColumn(0);
-		if((int)$sResult === 1) {
+		if ((int) $sResult === 1) {
 			$this->hasActiveShares = true;
 			return;
 		}
@@ -237,7 +237,7 @@ 
 		', 1);
 		$query->execute(array($this->ocName));
 		$sResult = $query->fetchColumn(0);
-		if((int)$sResult === 1) {
+		if ((int) $sResult === 1) {
 			$this->hasActiveShares = true;
 			return;
 		}

apps/user_ldap/lib/Command/ShowRemnants.php

Spacing +2 added lines, -2 removed lines

@@ -89,8 +89,8 @@
 				'displayName' => $user->getDisplayName(),
 				'uid' => $user->getUID(),
 				'dn' => $user->getDN(),
-				'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
-				'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
+				'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool) $input->getOption('short-date')),
+				'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool) $input->getOption('short-date')),
 				'homePath' => $user->getHomePath(),
 				'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
 			];

apps/dav/lib/BackgroundJob/UploadCleanup.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 		$this->jobList = $jobList;
 
 		// Run once a day
-		$this->setInterval(60*60*24);
+		$this->setInterval(60 * 60 * 24);
 	}
 
 	protected function run($argument) {