nextcloud / server

apps/federation/lib/SyncJob.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	protected function run($argument) {
 		$this->syncService->syncThemAll(function($url, $ex) {
 			if ($ex instanceof \Exception) {
-				$this->logger->error("Error while syncing $url : " . $ex->getMessage(), ['app' => 'fed-sync']);
+				$this->logger->error("Error while syncing $url : ".$ex->getMessage(), ['app' => 'fed-sync']);
 			}
 		});
 	}

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

Spacing +12 added lines, -12 removed lines

@@ -1,29 +1,29 @@ 
 <fieldset id="ldapWizard3">
 	<div>
 		<p>
-			<?php p($l->t('When logging in, %s will find the user based on the following attributes:', $theme->getName()));?>
+			<?php p($l->t('When logging in, %s will find the user based on the following attributes:', $theme->getName())); ?>
 		</p>
 		<p>
 			<label for="ldap_loginfilter_username">
-				<?php p($l->t('LDAP / AD Username:'));?>
+				<?php p($l->t('LDAP / AD Username:')); ?>
 			</label>
 
 			<input type="checkbox" id="ldap_loginfilter_username"
-				   title="<?php p($l->t('Allows login against the LDAP / AD username, which is either "uid" or "sAMAccountName" and will be detected.'));?>"
+				   title="<?php p($l->t('Allows login against the LDAP / AD username, which is either "uid" or "sAMAccountName" and will be detected.')); ?>"
 				   name="ldap_loginfilter_username" value="1" />
 		</p>
 		<p>
 			<label for="ldap_loginfilter_email">
-				<?php p($l->t('LDAP / AD Email Address:'));?>
+				<?php p($l->t('LDAP / AD Email Address:')); ?>
 			</label>
 
 			<input type="checkbox" id="ldap_loginfilter_email"
-				   title="<?php p($l->t('Allows login against an email attribute. "mail" and "mailPrimaryAddress" allowed.'));?>"
+				   title="<?php p($l->t('Allows login against an email attribute. "mail" and "mailPrimaryAddress" allowed.')); ?>"
 				   name="ldap_loginfilter_email" value="1" />
 		</p>
 		<p>
 			<label for="ldap_loginfilter_attributes">
-				<?php p($l->t('Other Attributes:'));?>
+				<?php p($l->t('Other Attributes:')); ?>
 			</label>
 
 			<select id="ldap_loginfilter_attributes" multiple="multiple"
@@ -31,17 +31,17 @@ 
 			</select>
 		</p>
 		<p>
-			<label><a id='toggleRawLoginFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
+			<label><a id='toggleRawLoginFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query')); ?></a></label>
 		</p>
 		<p id="ldapReadOnlyLoginFilterContainer" 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="rawLoginFilterContainer" class="invisible">
 			<textarea type="text" id="ldap_login_filter" name="ldap_login_filter"
 				class="ldapFilterInputElement"
-				placeholder="<?php p($l->t('Edit LDAP Query'));?>"
-				title="<?php p($l->t('Defines the filter to apply, when login is attempted. "%%uid" replaces the username in the login action. Example: "uid=%%uid"'));?>">
+				placeholder="<?php p($l->t('Edit LDAP Query')); ?>"
+				title="<?php p($l->t('Defines the filter to apply, when login is attempted. "%%uid" replaces the username in the login action. Example: "uid=%%uid"')); ?>">
 			</textarea>
 		</p>
 		<p>
@@ -49,11 +49,11 @@ 
 		</p>
 		<p class="ldap_verify">
 			<input type="text" id="ldap_test_loginname" name="ldap_test_loginname"
-				   placeholder="<?php p($l->t('Test Loginname'));?>"
+				   placeholder="<?php p($l->t('Test Loginname')); ?>"
 				   class="ldapVerifyInput"
 				   title="Attempts to receive a DN for the given loginname and the current login filter"/>
 			<button class="ldapVerifyLoginName" name="ldapTestLoginSettings" type="button" disabled="disabled">
-				<?php p($l->t('Verify settings'));?>
+				<?php p($l->t('Verify settings')); ?>
 			</button>
 		</p>
 		<?php print_unescaped($_['wizardControls']); ?>

lib/private/Mail/Message.php

Spacing +2 added lines, -2 removed lines

@@ -55,8 +55,8 @@
 
 		$convertedAddresses = array();
 
-		foreach($addresses as $email => $readableName) {
-			if(!is_numeric($email)) {
+		foreach ($addresses as $email => $readableName) {
+			if (!is_numeric($email)) {
 				list($name, $domain) = explode('@', $email, 2);
 				$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
 				$convertedAddresses[$name.'@'.$domain] = $readableName;

lib/private/Mail/Mailer.php

Spacing +4 added lines, -4 removed lines

@@ -129,7 +129,7 @@ 
 		$mailer = $this->getInstance();
 
 		// Enable logger if debug mode is enabled
-		if($debugMode) {
+		if ($debugMode) {
 			$mailLogger = new \Swift_Plugins_Loggers_ArrayLogger();
 			$mailer->registerPlugin(new \Swift_Plugins_LoggerPlugin($mailLogger));
 		}
@@ -139,7 +139,7 @@ 
 		// Debugging logging
 		$logMessage = sprintf('Sent mail to "%s" with subject "%s"', print_r($message->getTo(), true), $message->getSubject());
 		$this->logger->debug($logMessage, ['app' => 'core']);
-		if($debugMode && isset($mailLogger)) {
+		if ($debugMode && isset($mailLogger)) {
 			$this->logger->debug($mailLogger->dump(), ['app' => 'core']);
 		}
 
@@ -170,7 +170,7 @@ 
 		}
 
 		list($name, $domain) = explode('@', $email, 2);
-		$domain = idn_to_ascii($domain, 0,INTL_IDNA_VARIANT_UTS46);
+		$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
 		return $name.'@'.$domain;
 	}
 
@@ -240,7 +240,7 @@ 
 				break;
 		}
 
-		return \Swift_SendmailTransport::newInstance($binaryPath . ' -bs');
+		return \Swift_SendmailTransport::newInstance($binaryPath.' -bs');
 	}
 
 	/**

lib/private/AppFramework/Http/Request.php

Spacing +41 added lines, -41 removed lines

@@ -128,7 +128,7 @@ 
 	 * @param string $stream
 	 * @see http://www.php.net/manual/en/reserved.variables.php
 	 */
-	public function __construct(array $vars=array(),
+	public function __construct(array $vars = array(),
 								ISecureRandom $secureRandom = null,
 								IConfig $config,
 								CsrfTokenManager $csrfTokenManager = null,
@@ -139,11 +139,11 @@ 
 		$this->config = $config;
 		$this->csrfTokenManager = $csrfTokenManager;
 
-		if(!array_key_exists('method', $vars)) {
+		if (!array_key_exists('method', $vars)) {
 			$vars['method'] = 'GET';
 		}
 
-		foreach($this->allowedKeys as $name) {
+		foreach ($this->allowedKeys as $name) {
 			$this->items[$name] = isset($vars[$name])
 				? $vars[$name]
 				: array();
@@ -248,12 +248,12 @@ 
 	* @return mixed|null
 	*/
 	public function __get($name) {
-		switch($name) {
+		switch ($name) {
 			case 'put':
 			case 'patch':
 			case 'get':
 			case 'post':
-				if($this->method !== strtoupper($name)) {
+				if ($this->method !== strtoupper($name)) {
 					throw new \LogicException(sprintf('%s cannot be accessed in a %s request.', $name, $this->method));
 				}
 				return $this->getContent();
@@ -304,14 +304,14 @@ 
 	 */
 	public function getHeader($name) {
 
-		$name = strtoupper(str_replace(array('-'),array('_'),$name));
-		if (isset($this->server['HTTP_' . $name])) {
-			return $this->server['HTTP_' . $name];
+		$name = strtoupper(str_replace(array('-'), array('_'), $name));
+		if (isset($this->server['HTTP_'.$name])) {
+			return $this->server['HTTP_'.$name];
 		}
 
 		// There's a few headers that seem to end up in the top-level
 		// server array.
-		switch($name) {
+		switch ($name) {
 			case 'CONTENT_TYPE' :
 			case 'CONTENT_LENGTH' :
 				if (isset($this->server[$name])) {
@@ -432,21 +432,21 @@ 
 		// 'application/json' must be decoded manually.
 		if (strpos($this->getHeader('Content-Type'), 'application/json') !== false) {
 			$params = json_decode(file_get_contents($this->inputStream), true);
-			if($params !== null && count($params) > 0) {
+			if ($params !== null && count($params) > 0) {
 				$this->items['params'] = $params;
-				if($this->method === 'POST') {
+				if ($this->method === 'POST') {
 					$this->items['post'] = $params;
 				}
 			}
 
 		// Handle application/x-www-form-urlencoded for methods other than GET
 		// or post correctly
-		} elseif($this->method !== 'GET'
+		} elseif ($this->method !== 'GET'
 				&& $this->method !== 'POST'
 				&& strpos($this->getHeader('Content-Type'), 'application/x-www-form-urlencoded') !== false) {
 
 			parse_str(file_get_contents($this->inputStream), $params);
-			if(is_array($params)) {
+			if (is_array($params)) {
 				$this->items['params'] = $params;
 			}
 		}
@@ -463,11 +463,11 @@ 
 	 * @return bool true if CSRF check passed
 	 */
 	public function passesCSRFCheck() {
-		if($this->csrfTokenManager === null) {
+		if ($this->csrfTokenManager === null) {
 			return false;
 		}
 
-		if(!$this->passesStrictCookieCheck()) {
+		if (!$this->passesStrictCookieCheck()) {
 			return false;
 		}
 
@@ -495,7 +495,7 @@ 
 		if ($this->getHeader('OCS-APIREQUEST')) {
 			return false;
 		}
-		if($this->getCookie(session_name()) === null && $this->getCookie('nc_token') === null) {
+		if ($this->getCookie(session_name()) === null && $this->getCookie('nc_token') === null) {
 			return false;
 		}
 
@@ -520,7 +520,7 @@ 
 	protected function getProtectedCookieName($name) {
 		$cookieParams = $this->getCookieParams();
 		$prefix = '';
-		if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+		if ($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
 			$prefix = '__Host-';
 		}
 
@@ -535,12 +535,12 @@ 
 	 * @since 9.1.0
 	 */
 	public function passesStrictCookieCheck() {
-		if(!$this->cookieCheckRequired()) {
+		if (!$this->cookieCheckRequired()) {
 			return true;
 		}
 
 		$cookieName = $this->getProtectedCookieName('nc_sameSiteCookiestrict');
-		if($this->getCookie($cookieName) === 'true'
+		if ($this->getCookie($cookieName) === 'true'
 			&& $this->passesLaxCookieCheck()) {
 			return true;
 		}
@@ -555,12 +555,12 @@ 
 	 * @since 9.1.0
 	 */
 	public function passesLaxCookieCheck() {
-		if(!$this->cookieCheckRequired()) {
+		if (!$this->cookieCheckRequired()) {
 			return true;
 		}
 
 		$cookieName = $this->getProtectedCookieName('nc_sameSiteCookielax');
-		if($this->getCookie($cookieName) === 'true') {
+		if ($this->getCookie($cookieName) === 'true') {
 			return true;
 		}
 		return false;
@@ -573,12 +573,12 @@ 
 	 * @return string
 	 */
 	public function getId() {
-		if(isset($this->server['UNIQUE_ID'])) {
+		if (isset($this->server['UNIQUE_ID'])) {
 			return $this->server['UNIQUE_ID'];
 		}
 
-		if(empty($this->requestId)) {
-			$validChars = ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS;
+		if (empty($this->requestId)) {
+			$validChars = ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS;
 			$this->requestId = $this->secureRandom->generate(20, $validChars);
 		}
 
@@ -596,15 +596,15 @@ 
 		$remoteAddress = isset($this->server['REMOTE_ADDR']) ? $this->server['REMOTE_ADDR'] : '';
 		$trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
 
-		if(is_array($trustedProxies) && in_array($remoteAddress, $trustedProxies)) {
+		if (is_array($trustedProxies) && in_array($remoteAddress, $trustedProxies)) {
 			$forwardedForHeaders = $this->config->getSystemValue('forwarded_for_headers', [
 				'HTTP_X_FORWARDED_FOR'
 				// only have one default, so we cannot ship an insecure product out of the box
 			]);
 
-			foreach($forwardedForHeaders as $header) {
-				if(isset($this->server[$header])) {
-					foreach(explode(',', $this->server[$header]) as $IP) {
+			foreach ($forwardedForHeaders as $header) {
+				if (isset($this->server[$header])) {
+					foreach (explode(',', $this->server[$header]) as $IP) {
 						$IP = trim($IP);
 						if (filter_var($IP, FILTER_VALIDATE_IP) !== false) {
 							return $IP;
@@ -623,7 +623,7 @@ 
 	 * @return bool
 	 */
 	private function isOverwriteCondition($type = '') {
-		$regex = '/' . $this->config->getSystemValue('overwritecondaddr', '')  . '/';
+		$regex = '/'.$this->config->getSystemValue('overwritecondaddr', '').'/';
 		$remoteAddr = isset($this->server['REMOTE_ADDR']) ? $this->server['REMOTE_ADDR'] : '';
 		return $regex === '//' || preg_match($regex, $remoteAddr) === 1
 		|| $type !== 'protocol';
@@ -635,7 +635,7 @@ 
 	 * @return string Server protocol (http or https)
 	 */
 	public function getServerProtocol() {
-		if($this->config->getSystemValue('overwriteprotocol') !== ''
+		if ($this->config->getSystemValue('overwriteprotocol') !== ''
 			&& $this->isOverwriteCondition('protocol')) {
 			return $this->config->getSystemValue('overwriteprotocol');
 		}
@@ -677,7 +677,7 @@ 
 			'HTTP/2',
 		];
 
-		if(in_array($claimedProtocol, $validProtocols, true)) {
+		if (in_array($claimedProtocol, $validProtocols, true)) {
 			return $claimedProtocol;
 		}
 
@@ -691,8 +691,8 @@ 
 	 */
 	public function getRequestUri() {
 		$uri = isset($this->server['REQUEST_URI']) ? $this->server['REQUEST_URI'] : '';
-		if($this->config->getSystemValue('overwritewebroot') !== '' && $this->isOverwriteCondition()) {
-			$uri = $this->getScriptName() . substr($uri, strlen($this->server['SCRIPT_NAME']));
+		if ($this->config->getSystemValue('overwritewebroot') !== '' && $this->isOverwriteCondition()) {
+			$uri = $this->getScriptName().substr($uri, strlen($this->server['SCRIPT_NAME']));
 		}
 		return $uri;
 	}
@@ -706,7 +706,7 @@ 
 		$requestUri = isset($this->server['REQUEST_URI']) ? $this->server['REQUEST_URI'] : '';
 		// remove too many leading slashes - can be caused by reverse proxy configuration
 		if (strpos($requestUri, '/') === 0) {
-			$requestUri = '/' . ltrim($requestUri, '/');
+			$requestUri = '/'.ltrim($requestUri, '/');
 		}
 
 		$requestUri = preg_replace('%/{2,}%', '/', $requestUri);
@@ -723,7 +723,7 @@ 
 		// FIXME: Sabre does not really belong here
 		list($path, $name) = \Sabre\Uri\split($scriptName);
 		if (!empty($path)) {
-			if($path === $pathInfo || strpos($pathInfo, $path.'/') === 0) {
+			if ($path === $pathInfo || strpos($pathInfo, $path.'/') === 0) {
 				$pathInfo = substr($pathInfo, strlen($path));
 			} else {
 				throw new \Exception("The requested uri($requestUri) cannot be processed by the script '$scriptName')");
@@ -735,7 +735,7 @@ 
 		if (strpos($pathInfo, $name) === 0) {
 			$pathInfo = substr($pathInfo, strlen($name));
 		}
-		if($pathInfo === false || $pathInfo === '/'){
+		if ($pathInfo === false || $pathInfo === '/') {
 			return '';
 		} else {
 			return $pathInfo;
@@ -753,7 +753,7 @@ 
 		$pathInfo = rawurldecode($pathInfo);
 		$encoding = mb_detect_encoding($pathInfo, ['UTF-8', 'ISO-8859-1']);
 
-		switch($encoding) {
+		switch ($encoding) {
 			case 'ISO-8859-1' :
 				$pathInfo = utf8_encode($pathInfo);
 		}
@@ -769,12 +769,12 @@ 
 	 */
 	public function getScriptName() {
 		$name = $this->server['SCRIPT_NAME'];
-		$overwriteWebRoot =  $this->config->getSystemValue('overwritewebroot');
+		$overwriteWebRoot = $this->config->getSystemValue('overwritewebroot');
 		if ($overwriteWebRoot !== '' && $this->isOverwriteCondition()) {
 			// FIXME: This code is untestable due to __DIR__, also that hardcoded path is really dangerous
 			$serverRoot = str_replace('\\', '/', substr(__DIR__, 0, -strlen('lib/private/appframework/http/')));
 			$suburi = str_replace('\\', '/', substr(realpath($this->server['SCRIPT_FILENAME']), strlen($serverRoot)));
-			$name = '/' . ltrim($overwriteWebRoot . $suburi, '/');
+			$name = '/'.ltrim($overwriteWebRoot.$suburi, '/');
 		}
 		return $name;
 	}
@@ -844,7 +844,7 @@ 
 			return $host;
 		} else {
 			$trustedList = $this->config->getSystemValue('trusted_domains', []);
-			if(!empty($trustedList)) {
+			if (!empty($trustedList)) {
 				return $trustedList[0];
 			} else {
 				return '';
@@ -859,7 +859,7 @@ 
 	 * isn't met
 	 */
 	private function getOverwriteHost() {
-		if($this->config->getSystemValue('overwritehost') !== '' && $this->isOverwriteCondition()) {
+		if ($this->config->getSystemValue('overwritehost') !== '' && $this->isOverwriteCondition()) {
 			return $this->config->getSystemValue('overwritehost');
 		}
 		return null;

lib/private/Route/Route.php

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
 	public function actionInclude($file) {
 		$function = function($param) use ($file) {
 			unset($param["_route"]);
-			$_GET=array_merge($_GET, $param);
+			$_GET = array_merge($_GET, $param);
 			unset($param);
 			require_once "$file";
 		} ;

apps/files_sharing/lib/Controller/ShareInfoController.php

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 	protected function addROWrapper() {
 		// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
 		$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-		\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
+		\OC\Files\Filesystem::addStorageWrapper('readonly', function($mountPoint, $storage) {
 			return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
 		});
 		\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);

core/templates/loginflow/authpicker.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 	<h2><?php p($l->t('Account access')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('You are about to grant %s access to your %s account.', [
-								'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+								'<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>',
 								\OCP\Util::sanitizeHTML($_['instanceName'])
 							])) ?>
 	</p>
@@ -58,6 +58,6 @@ 
 	</fieldset>
 </div>
 
-<?php if(empty($_['oauthState'])): ?>
+<?php if (empty($_['oauthState'])): ?>
 <a id="app-token-login" class="warning" href="#"><?php p($l->t('Alternative login using app token')) ?></a>
 <?php endif; ?>

apps/files_sharing/lib/ExpireSharesJob.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 			);
 
 		$shares = $qb->execute();
-		while($share = $shares->fetch()) {
+		while ($share = $shares->fetch()) {
 			\OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
 		}
 		$shares->closeCursor();