nextcloud / server

lib/private/Activity/Event.php

Spacing +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
 	 */
 	public function setAuthor($author) {
 		if (!is_string($author) || isset($author[64])) {
-			throw new \InvalidArgumentException('The given author user is invalid'. serialize($author));
+			throw new \InvalidArgumentException('The given author user is invalid'.serialize($author));
 		}
 		$this->author = (string) $author;
 		return $this;

lib/private/Activity/Manager.php

Spacing +3 added lines, -3 removed lines

@@ -112,7 +112,7 @@ 
 		}
 
 		$this->consumers = [];
-		foreach($this->consumersClosures as $consumer) {
+		foreach ($this->consumersClosures as $consumer) {
 			$c = $consumer();
 			if ($c instanceof IConsumer) {
 				$this->consumers[] = $c;
@@ -133,7 +133,7 @@ 
 		}
 
 		$this->extensions = [];
-		foreach($this->extensionsClosures as $extension) {
+		foreach ($this->extensionsClosures as $extension) {
 			$e = $extension();
 			if ($e instanceof IExtension) {
 				$this->extensions[] = $e;
@@ -669,7 +669,7 @@ 
 			return array(null, null);
 		}
 
-		return array(' and ((' . implode(') or (', $conditions) . '))', $parameters);
+		return array(' and (('.implode(') or (', $conditions).'))', $parameters);
 	}
 
 	/**

lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 	 * @return string
 	 */
 	public function getNonce() {
-		if($this->nonce === '') {
+		if ($this->nonce === '') {
 			$this->nonce = base64_encode($this->csrfTokenManager->getToken()->getEncryptedValue());
 		}
 
@@ -71,7 +71,7 @@ 
 			'/^Mozilla\/5\.0 \([^)]+\) Gecko\/[0-9.]+ Firefox\/(4[5-9]|[5-9][0-9])\.[0-9.]+$/',
 		];
 
-		if($this->request->isUserAgent($browserWhitelist)) {
+		if ($this->request->isUserAgent($browserWhitelist)) {
 			return true;
 		}
 

lib/private/Security/CSP/ContentSecurityPolicyManager.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	public function getDefaultPolicy() {
 		$defaultPolicy = new \OC\Security\CSP\ContentSecurityPolicy();
-		foreach($this->policies as $policy) {
+		foreach ($this->policies as $policy) {
 			$defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
 		}
 		return $defaultPolicy;
@@ -58,9 +58,9 @@ 
 	 */
 	public function mergePolicies(ContentSecurityPolicy $defaultPolicy,
 								  EmptyContentSecurityPolicy $originalPolicy) {
-		foreach((object)(array)$originalPolicy as $name => $value) {
+		foreach ((object) (array) $originalPolicy as $name => $value) {
 			$setter = 'set'.ucfirst($name);
-			if(is_array($value)) {
+			if (is_array($value)) {
 				$getter = 'get'.ucfirst($name);
 				$currentValues = is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
 				$defaultPolicy->$setter(array_values(array_unique(array_merge($currentValues, $value))));

lib/private/Security/TrustedDomainHelper.php

Spacing +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 			return true;
 		}
 		// Reject misformed domains in any case
-		if (strpos($domain,'-') === 0 || strpos($domain,'..') !== false) {
+		if (strpos($domain, '-') === 0 || strpos($domain, '..') !== false) {
 			return false;
 		}
 		// Match, allowing for * wildcards
@@ -89,7 +89,7 @@ 
 			if (gettype($trusted) !== 'string') {
 				break;
 			}
-			$regex = '/^' . join('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))) . '$/';
+			$regex = '/^'.join('[-\.a-zA-Z0-9]*', array_map(function($v) { return preg_quote($v, '/'); }, explode('*', $trusted))).'$/';
 			if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
  				return true;
  			}

lib/private/Security/Hasher.php

Spacing +10 added lines, -10 removed lines

@@ -62,7 +62,7 @@ 
 		$this->config = $config;
 
 		$hashingCost = $this->config->getSystemValue('hashingCost', null);
-		if(!is_null($hashingCost)) {
+		if (!is_null($hashingCost)) {
 			$this->options['cost'] = $hashingCost;
 		}
 	}
@@ -76,7 +76,7 @@ 
 	 * @return string Hash of the message with appended version parameter
 	 */
 	public function hash($message) {
-		return $this->currentVersion . '|' . password_hash($message, PASSWORD_DEFAULT, $this->options);
+		return $this->currentVersion.'|'.password_hash($message, PASSWORD_DEFAULT, $this->options);
 	}
 
 	/**
@@ -86,9 +86,9 @@ 
 	 */
 	protected function splitHash($prefixedHash) {
 		$explodedString = explode('|', $prefixedHash, 2);
-		if(sizeof($explodedString) === 2) {
-			if((int)$explodedString[0] > 0) {
-				return array('version' => (int)$explodedString[0], 'hash' => $explodedString[1]);
+		if (sizeof($explodedString) === 2) {
+			if ((int) $explodedString[0] > 0) {
+				return array('version' => (int) $explodedString[0], 'hash' => $explodedString[1]);
 			}
 		}
 
@@ -103,13 +103,13 @@ 
 	 * @return bool Whether $hash is a valid hash of $message
 	 */
 	protected function legacyHashVerify($message, $hash, &$newHash = null) {
-		if(empty($this->legacySalt)) {
+		if (empty($this->legacySalt)) {
 			$this->legacySalt = $this->config->getSystemValue('passwordsalt', '');
 		}
 
 		// Verify whether it matches a legacy PHPass or SHA1 string
 		$hashLength = strlen($hash);
-		if($hashLength === 60 && password_verify($message.$this->legacySalt, $hash) ||
+		if ($hashLength === 60 && password_verify($message.$this->legacySalt, $hash) ||
 			$hashLength === 40 && hash_equals($hash, sha1($message))) {
 			$newHash = $this->hash($message);
 			return true;
@@ -126,8 +126,8 @@ 
 	 * @return bool Whether $hash is a valid hash of $message
 	 */
 	protected function verifyHashV1($message, $hash, &$newHash = null) {
-		if(password_verify($message, $hash)) {
-			if(password_needs_rehash($hash, PASSWORD_DEFAULT, $this->options)) {
+		if (password_verify($message, $hash)) {
+			if (password_needs_rehash($hash, PASSWORD_DEFAULT, $this->options)) {
 				$newHash = $this->hash($message);
 			}
 			return true;
@@ -145,7 +145,7 @@ 
 	public function verify($message, $hash, &$newHash = null) {
 		$splittedHash = $this->splitHash($hash);
 
-		if(isset($splittedHash['version'])) {
+		if (isset($splittedHash['version'])) {
 			switch ($splittedHash['version']) {
 				case 1:
 					return $this->verifyHashV1($message, $splittedHash['hash'], $newHash);

lib/private/Security/CSRF/CsrfToken.php

Spacing +2 added lines, -2 removed lines

@@ -50,9 +50,9 @@
 	 * @return string
 	 */
 	public function getEncryptedValue() {
-		if($this->encryptedValue === '') {
+		if ($this->encryptedValue === '') {
 			$sharedSecret = random_bytes(strlen($this->value));
-			$this->encryptedValue = base64_encode($this->value ^ $sharedSecret) . ':' . base64_encode($sharedSecret);
+			$this->encryptedValue = base64_encode($this->value ^ $sharedSecret).':'.base64_encode($sharedSecret);
 		}
 
 		return $this->encryptedValue;

lib/private/Security/CSRF/TokenStorage/SessionStorage.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	 */
 	public function getToken() {
 		$token = $this->session->get('requesttoken');
-		if(empty($token)) {
+		if (empty($token)) {
 			throw new \Exception('Session does not contain a requesttoken');
 		}
 

lib/private/Security/CSRF/CsrfTokenManager.php

Spacing +3 added lines, -3 removed lines

@@ -53,11 +53,11 @@ 
 	 * @return CsrfToken
 	 */
 	public function getToken() {
-		if(!is_null($this->csrfToken)) {
+		if (!is_null($this->csrfToken)) {
 			return $this->csrfToken;
 		}
 
-		if($this->sessionStorage->hasToken()) {
+		if ($this->sessionStorage->hasToken()) {
 			$value = $this->sessionStorage->getToken();
 		} else {
 			$value = $this->tokenGenerator->generateToken();
@@ -95,7 +95,7 @@ 
 	 * @return bool
 	 */
 	public function isTokenValid(CsrfToken $token) {
-		if(!$this->sessionStorage->hasToken()) {
+		if (!$this->sessionStorage->hasToken()) {
 			return false;
 		}