nextcloud / server

lib/private/User/Manager.php

Spacing +10 added lines, -10 removed lines

@@ -77,7 +77,7 @@ 
 	public function __construct(IConfig $config) {
 		$this->config = $config;
 		$cachedUsers = &$this->cachedUsers;
-		$this->listen('\OC\User', 'postDelete', function ($user) use (&$cachedUsers) {
+		$this->listen('\OC\User', 'postDelete', function($user) use (&$cachedUsers) {
 			/** @var \OC\User\User $user */
 			unset($cachedUsers[$user->getUID()]);
 		});
@@ -193,7 +193,7 @@ 
 		$result = $this->checkPasswordNoLogging($loginName, $password);
 
 		if ($result === false) {
-			\OC::$server->getLogger()->warning('Login failed: \''. $loginName .'\' (Remote IP: \''. \OC::$server->getRequest()->getRemoteAddress(). '\')', ['app' => 'core']);
+			\OC::$server->getLogger()->warning('Login failed: \''.$loginName.'\' (Remote IP: \''.\OC::$server->getRequest()->getRemoteAddress().'\')', ['app' => 'core']);
 		}
 
 		return $result;
@@ -242,7 +242,7 @@ 
 			}
 		}
 
-		uasort($users, function ($a, $b) {
+		uasort($users, function($a, $b) {
 			/**
 			 * @var \OC\User\User $a
 			 * @var \OC\User\User $b
@@ -271,7 +271,7 @@ 
 			}
 		}
 
-		usort($users, function ($a, $b) {
+		usort($users, function($a, $b) {
 			/**
 			 * @var \OC\User\User $a
 			 * @var \OC\User\User $b
@@ -350,7 +350,7 @@ 
 
 		$this->emit('\OC\User', 'preCreateUser', [$uid, $password]);
 		$state = $backend->createUser($uid, $password);
-		if($state === false) {
+		if ($state === false) {
 			throw new \InvalidArgumentException($l->t('Could not create user'));
 		}
 		$user = $this->getUserObject($uid, $backend);
@@ -376,13 +376,13 @@ 
 		foreach ($this->backends as $backend) {
 			if ($backend->implementsActions(Backend::COUNT_USERS)) {
 				$backendUsers = $backend->countUsers();
-				if($backendUsers !== false) {
-					if($backend instanceof IUserBackend) {
+				if ($backendUsers !== false) {
+					if ($backend instanceof IUserBackend) {
 						$name = $backend->getBackendName();
 					} else {
 						$name = get_class($backend);
 					}
-					if(isset($userCountStatistics[$name])) {
+					if (isset($userCountStatistics[$name])) {
 						$userCountStatistics[$name] += $backendUsers;
 					} else {
 						$userCountStatistics[$name] = $backendUsers;
@@ -444,7 +444,7 @@ 
 
 		$query = $queryBuilder->execute();
 
-		$result = (int)$query->fetchColumn();
+		$result = (int) $query->fetchColumn();
 		$query->closeCursor();
 
 		return $result;
@@ -466,7 +466,7 @@ 
 
 		$query = $queryBuilder->execute();
 
-		$result = (int)$query->fetchColumn();
+		$result = (int) $query->fetchColumn();
 		$query->closeCursor();
 
 		return $result;

core/Controller/LostController.php

Spacing +9 added lines, -9 removed lines

@@ -167,7 +167,7 @@ 
 	 */
 	protected function checkPasswordResetToken($token, $userId) {
 		$user = $this->userManager->get($userId);
-		if($user === null || !$user->isEnabled()) {
+		if ($user === null || !$user->isEnabled()) {
 			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
 		}
 
@@ -180,11 +180,11 @@ 
 		}
 
 		$splittedToken = explode(':', $decryptedToken);
-		if(count($splittedToken) !== 2) {
+		if (count($splittedToken) !== 2) {
 			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
 		}
 
-		if ($splittedToken[0] < ($this->timeFactory->getTime() - 60*60*12) ||
+		if ($splittedToken[0] < ($this->timeFactory->getTime() - 60 * 60 * 12) ||
 			$user->getLastLogin() > $splittedToken[0]) {
 			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is expired'));
 		}
@@ -199,7 +199,7 @@ 
 	 * @param array $additional
 	 * @return array
 	 */
-	private function error($message, array $additional=array()) {
+	private function error($message, array $additional = array()) {
 		return array_merge(array('status' => 'error', 'msg' => $message), $additional);
 	}
 
@@ -218,7 +218,7 @@ 
 	 * @param string $user
 	 * @return JSONResponse
 	 */
-	public function email($user){
+	public function email($user) {
 		if ($this->config->getSystemValue('lost_password_link', '') !== '') {
 			return new JSONResponse($this->error($this->l10n->t('Password reset is disabled')));
 		}
@@ -226,7 +226,7 @@ 
 		// FIXME: use HTTP error codes
 		try {
 			$this->sendEmail($user);
-		} catch (\Exception $e){
+		} catch (\Exception $e) {
 			$response = new JSONResponse($this->error($e->getMessage()));
 			$response->throttle();
 			return $response;
@@ -268,7 +268,7 @@ 
 
 			$this->config->deleteUserValue($userId, 'core', 'lostpassword');
 			@\OC::$server->getUserSession()->unsetMagicInCookie();
-		} catch (\Exception $e){
+		} catch (\Exception $e) {
 			return $this->error($e->getMessage());
 		}
 
@@ -299,8 +299,8 @@ 
 			ISecureRandom::CHAR_LOWER.
 			ISecureRandom::CHAR_UPPER
 		);
-		$tokenValue = $this->timeFactory->getTime() .':'. $token;
-		$encryptedValue = $this->crypto->encrypt($tokenValue, $email . $this->config->getSystemValue('secret'));
+		$tokenValue = $this->timeFactory->getTime().':'.$token;
+		$encryptedValue = $this->crypto->encrypt($tokenValue, $email.$this->config->getSystemValue('secret'));
 		$this->config->setUserValue($user->getUID(), 'core', 'lostpassword', $encryptedValue);
 
 		$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', array('userId' => $user->getUID(), 'token' => $token));

apps/encryption/templates/settings-admin.php

Spacing +5 added lines, -5 removed lines

@@ -7,17 +7,17 @@ 
 ?>
 <form id="ocDefaultEncryptionModule" class="sub-section">
 	<h3><?php p($l->t("Default encryption module")); ?></h3>
-	<?php if(!$_["initStatus"] && $_['masterKeyEnabled'] === false): ?>
+	<?php if (!$_["initStatus"] && $_['masterKeyEnabled'] === false): ?>
 		<?php p($l->t("Encryption app is enabled but your keys are not initialized, please log-out and log-in again")); ?>
 	<?php else: ?>
 		<p id="encryptHomeStorageSetting">
 			<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
 				   value="1" <?php if ($_['encryptHomeStorage']) print_unescaped('checked="checked"'); ?> />
-			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
-			<em><?php p( $l->t( "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" ) ); ?></em>
+			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage')); ?></label></br>
+			<em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em>
 		</p>
 		<br />
-		<?php if($_['masterKeyEnabled'] === false): ?>
+		<?php if ($_['masterKeyEnabled'] === false): ?>
 			<p id="encryptionSetRecoveryKey">
 				<?php $_["recoveryEnabled"] === '0' ?  p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>
 				<span class="msg"></span>
@@ -42,7 +42,7 @@ 
 			</p>
 			<br/><br/>
 
-			<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>>
+			<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if ($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"'); ?>>
 				<?php p($l->t("Change recovery key password:")); ?>
 				<span class="msg"></span>
 				<br/>

lib/private/Files/Config/CachedMountFileInfo.php

Spacing +1 added lines, -1 removed lines

@@ -43,6 +43,6 @@
 	}
 
 	public function getPath() {
-		return $this->getMountPoint() . $this->getInternalPath();
+		return $this->getMountPoint().$this->getInternalPath();
 	}
 }
\ No newline at end of file

core/Command/Maintenance/Mimetype/UpdateJS.php

Spacing +7 added lines, -7 removed lines

@@ -56,7 +56,7 @@ 
 		$keys = array_filter(array_keys($aliases), function($k) {
 			return $k[0] === '_';
 		});
-		foreach($keys as $key) {
+		foreach ($keys as $key) {
 			unset($aliases[$key]);
 		}
 
@@ -64,7 +64,7 @@ 
 		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
 
 		$files = [];
-		foreach($dir as $fileInfo) {
+		foreach ($dir as $fileInfo) {
 			if ($fileInfo->isFile()) {
 				$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
 				$files[] = $file;
@@ -78,14 +78,14 @@ 
 		// Fetch all themes!
 		$themes = [];
 		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
-		foreach($dirs as $dir) {
+		foreach ($dirs as $dir) {
 			//Valid theme dir
 			if ($dir->isFile() || $dir->isDot()) {
 				continue;
 			}
 
 			$theme = $dir->getFilename();
-			$themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
+			$themeDir = $dir->getPath().'/'.$theme.'/core/img/filetypes/';
 			// Check if this theme has its own filetype icons
 			if (!file_exists($themeDir)) {
 				continue;
@@ -116,9 +116,9 @@ 
 * To regenerate this file run ./occ maintenance:mimetype:update-js
 */
 OC.MimeTypeList={
-	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . ',
-	files: ' . json_encode($files, JSON_PRETTY_PRINT) . ',
-	themes: ' . json_encode($themes, JSON_PRETTY_PRINT) . '
+	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES).',
+	files: ' . json_encode($files, JSON_PRETTY_PRINT).',
+	themes: ' . json_encode($themes, JSON_PRETTY_PRINT).'
 };
 ';
 

lib/private/Collaboration/Collaborators/LookupPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		try {
 			$client = $this->clientService->newClient();
 			$response = $client->get(
-				$lookupServerUrl . '/users?search=' . urlencode($search),
+				$lookupServerUrl.'/users?search='.urlencode($search),
 				[
 					'timeout' => 10,
 					'connect_timeout' => 3,

lib/private/Template/ResourceLocator.php

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
 				$this->doFind($resource);
 			} catch (ResourceNotFoundException $e) {
 				$resourceApp = substr($resource, 0, strpos($resource, '/'));
-				$this->logger->debug('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
+				$this->logger->debug('Could not find resource file "'.$e->getResourcePath().'"', ['app' => $resourceApp]);
 			}
 		}
 		if (!empty($this->theme)) {
@@ -84,7 +84,7 @@ 
 					$this->doFindTheme($resource);
 				} catch (ResourceNotFoundException $e) {
 					$resourceApp = substr($resource, 0, strpos($resource, '/'));
-					$this->logger->debug('Could not find resource file in theme "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
+					$this->logger->debug('Could not find resource file in theme "'.$e->getResourcePath().'"', ['app' => $resourceApp]);
 				}
 			}
 		}
@@ -185,7 +185,7 @@ 
 		}
 		$this->resources[] = array($root, $webRoot, $file);
 
-		if ($throw && !is_file($root . '/' . $file)) {
+		if ($throw && !is_file($root.'/'.$file)) {
 			throw new ResourceNotFoundException($file, $webRoot);
 		}
 	}

lib/public/GroupInterface.php

Spacing +5 added lines, -5 removed lines

@@ -46,15 +46,15 @@
 	const CREATE_GROUP		= 0x00000001;
 	const DELETE_GROUP		= 0x00000010;
 	const ADD_TO_GROUP		= 0x00000100;
-	const REMOVE_FROM_GOUP	= 0x00001000; // oops
-	const REMOVE_FROM_GROUP	= 0x00001000;
+	const REMOVE_FROM_GOUP = 0x00001000; // oops
+	const REMOVE_FROM_GROUP = 0x00001000;
 	//OBSOLETE const GET_DISPLAYNAME	= 0x00010000;
-	const COUNT_USERS		= 0x00100000;
-	const GROUP_DETAILS		= 0x01000000;
+	const COUNT_USERS = 0x00100000;
+	const GROUP_DETAILS = 0x01000000;
 	/**
 	 * @since 13.0.0
 	 */
-	const IS_ADMIN  = 0x10000000;
+	const IS_ADMIN = 0x10000000;
 
 	/**
 	 * Check if backend implements actions

lib/private/Setup/OCI.php

Spacing +10 added lines, -10 removed lines

@@ -71,18 +71,18 @@
 			$errorMessage = $this->getLastError();
 			if ($errorMessage) {
 				throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
-					$errorMessage . ' Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME')
-					. ' ORACLE_SID=' . getenv('ORACLE_SID')
-					. ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH')
-					. ' NLS_LANG=' . getenv('NLS_LANG')
-					. ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable');
+					$errorMessage.' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+					. ' ORACLE_SID='.getenv('ORACLE_SID')
+					. ' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+					. ' NLS_LANG='.getenv('NLS_LANG')
+					. ' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora') ? '' : 'not ').'readable');
 			}
 			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
-				'Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME')
-				. ' ORACLE_SID=' . getenv('ORACLE_SID')
-				. ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH')
-				. ' NLS_LANG=' . getenv('NLS_LANG')
-				. ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable');
+				'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+				. ' ORACLE_SID='.getenv('ORACLE_SID')
+				. ' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+				. ' NLS_LANG='.getenv('NLS_LANG')
+				. ' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora') ? '' : 'not ').'readable');
 		}
 
 		$this->config->setValues([