nextcloud / server

lib/private/Encryption/Keys/Storage.php

Spacing +18 added lines, -18 removed lines

@@ -80,8 +80,8 @@ 
 		$this->util = $util;
 
 		$this->encryption_base_dir = '/files_encryption';
-		$this->keys_base_dir = $this->encryption_base_dir .'/keys';
-		$this->backup_base_dir = $this->encryption_base_dir .'/backup';
+		$this->keys_base_dir = $this->encryption_base_dir.'/keys';
+		$this->backup_base_dir = $this->encryption_base_dir.'/backup';
 		$this->root_dir = $this->util->getKeyStorageRoot();
 		$this->crypto = $crypto;
 		$this->config = $config;
@@ -101,14 +101,14 @@ 
 	public function getFileKey($path, $keyId, $encryptionModuleId) {
 		$realFile = $this->util->stripPartialFileExtension($path);
 		$keyDir = $this->getFileKeyDir($encryptionModuleId, $realFile);
-		$key = $this->getKey($keyDir . $keyId)['key'];
+		$key = $this->getKey($keyDir.$keyId)['key'];
 
 		if ($key === '' && $realFile !== $path) {
 			// Check if the part file has keys and use them, if no normal keys
 			// exist. This is required to fix copyBetweenStorage() when we
 			// rename a .part file over storage borders.
 			$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-			$key = $this->getKey($keyDir . $keyId)['key'];
+			$key = $this->getKey($keyDir.$keyId)['key'];
 		}
 
 		return base64_decode($key);
@@ -138,7 +138,7 @@ 
 	 */
 	public function setFileKey($path, $keyId, $key, $encryptionModuleId) {
 		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-		return $this->setKey($keyDir . $keyId, [
+		return $this->setKey($keyDir.$keyId, [
 			'key' => base64_encode($key),
 		]);
 	}
@@ -180,7 +180,7 @@ 
 	 */
 	public function deleteFileKey($path, $keyId, $encryptionModuleId) {
 		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-		return !$this->view->file_exists($keyDir . $keyId) || $this->view->unlink($keyDir . $keyId);
+		return !$this->view->file_exists($keyDir.$keyId) || $this->view->unlink($keyDir.$keyId);
 	}
 
 	/**
@@ -209,10 +209,10 @@ 
 	 */
 	protected function constructUserKeyPath($encryptionModuleId, $keyId, $uid) {
 		if ($uid === null) {
-			$path = $this->root_dir . '/' . $this->encryption_base_dir . '/' . $encryptionModuleId . '/' . $keyId;
+			$path = $this->root_dir.'/'.$this->encryption_base_dir.'/'.$encryptionModuleId.'/'.$keyId;
 		} else {
-			$path = $this->root_dir . '/' . $uid . $this->encryption_base_dir . '/'
-				. $encryptionModuleId . '/' . $uid . '.' . $keyId;
+			$path = $this->root_dir.'/'.$uid.$this->encryption_base_dir.'/'
+				. $encryptionModuleId.'/'.$uid.'.'.$keyId;
 		}
 
 		return \OC\Files\Filesystem::normalizePath($path);
@@ -369,12 +369,12 @@ 
 
 		// in case of system wide mount points the keys are stored directly in the data directory
 		if ($this->util->isSystemWideMountPoint($filename, $owner)) {
-			$keyPath = $this->root_dir . '/' . $this->keys_base_dir . $filename . '/';
+			$keyPath = $this->root_dir.'/'.$this->keys_base_dir.$filename.'/';
 		} else {
-			$keyPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $filename . '/';
+			$keyPath = $this->root_dir.'/'.$owner.$this->keys_base_dir.$filename.'/';
 		}
 
-		return Filesystem::normalizePath($keyPath . $encryptionModuleId . '/', false);
+		return Filesystem::normalizePath($keyPath.$encryptionModuleId.'/', false);
 	}
 
 	/**
@@ -429,13 +429,13 @@ 
 	 * @since 12.0.0
 	 */
 	public function backupUserKeys($encryptionModuleId, $purpose, $uid) {
-		$source = $uid . $this->encryption_base_dir . '/' . $encryptionModuleId;
-		$backupDir = $uid . $this->backup_base_dir;
+		$source = $uid.$this->encryption_base_dir.'/'.$encryptionModuleId;
+		$backupDir = $uid.$this->backup_base_dir;
 		if (!$this->view->file_exists($backupDir)) {
 			$this->view->mkdir($backupDir);
 		}
 
-		$backupDir = $backupDir . '/' . $purpose . '.' . $encryptionModuleId . '.' . $this->getTimestamp();
+		$backupDir = $backupDir.'/'.$purpose.'.'.$encryptionModuleId.'.'.$this->getTimestamp();
 		$this->view->mkdir($backupDir);
 
 		return $this->view->copy($source, $backupDir);
@@ -461,9 +461,9 @@ 
 		$systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner);
 
 		if ($systemWideMountPoint) {
-			$systemPath = $this->root_dir . '/' . $this->keys_base_dir . $relativePath . '/';
+			$systemPath = $this->root_dir.'/'.$this->keys_base_dir.$relativePath.'/';
 		} else {
-			$systemPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $relativePath . '/';
+			$systemPath = $this->root_dir.'/'.$owner.$this->keys_base_dir.$relativePath.'/';
 		}
 
 		return  Filesystem::normalizePath($systemPath, false);
@@ -480,7 +480,7 @@ 
 			$sub_dirs = explode('/', ltrim($path, '/'));
 			$dir = '';
 			foreach ($sub_dirs as $sub_dir) {
-				$dir .= '/' . $sub_dir;
+				$dir .= '/'.$sub_dir;
 				if (!$this->view->is_dir($dir)) {
 					$this->view->mkdir($dir);
 				}

lib/private/legacy/OC_API.php

Spacing +1 added lines, -1 removed lines

@@ -375,7 +375,7 @@
 		}
 
 		foreach ($result->getHeaders() as $name => $value) {
-			header($name . ': ' . $value);
+			header($name.': '.$value);
 		}
 
 		$meta = $result->getMeta();

lib/private/legacy/OC_FileChunking.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 	public function isComplete() {
 		$prefix = $this->getPrefix();
 		$cache = $this->getCache();
-		$chunkcount = (int)$this->info['chunkcount'];
+		$chunkcount = (int) $this->info['chunkcount'];
 
 		for ($i = ($chunkcount - 1); $i >= 0; $i--) {
 			if (!$cache->hasKey($prefix.$i)) {

lib/private/legacy/OC_Hook.php

Spacing +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
 		// Call all slots
 		foreach (self::$registered[$signalClass][$signalName] as $i) {
 			try {
-				call_user_func([ $i["class"], $i["name"] ], $params);
+				call_user_func([$i["class"], $i["name"]], $params);
 			} catch (Exception $e) {
 				self::$thrownExceptions[] = $e;
 				\OC::$server->getLogger()->logException($e);

lib/private/Route/Route.php

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
 	 * @return void
 	 */
 	public function actionInclude($file) {
-		$function = function ($param) use ($file) {
+		$function = function($param) use ($file) {
 			unset($param["_route"]);
 			$_GET = array_merge($_GET, $param);
 			unset($param);

lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 		foreach ($policies as $policy) {
 			header(
 				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;'.$secureCookie.'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
 					$cookiePrefix,
 					$policy,
 					$cookieParams['path'],

lib/private/AppFramework/Http.php

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
 			$status = self::STATUS_FOUND;
 		}
 
-		return $this->protocolVersion . ' ' . $status . ' ' .
+		return $this->protocolVersion.' '.$status.' '.
 			$this->headers[$status];
 	}
 }

lib/private/Collaboration/Collaborators/GroupPlugin.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 		$result = ['wide' => [], 'exact' => []];
 
 		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groupIds = array_map(function (IGroup $group) {
+		$groupIds = array_map(function(IGroup $group) {
 			return $group->getGID();
 		}, $groups);
 
@@ -75,7 +75,7 @@ 
 		if (!empty($groups) && ($this->shareWithGroupOnly || $this->shareeEnumerationInGroupOnly)) {
 			// Intersect all the groups that match with the groups this user is a member of
 			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
-			$userGroups = array_map(function (IGroup $group) {
+			$userGroups = array_map(function(IGroup $group) {
 				return $group->getGID();
 			}, $userGroups);
 			$groupIds = array_intersect($groupIds, $userGroups);

lib/public/AppFramework/ApiController.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 		$response = new Response();
 		$response->addHeader('Access-Control-Allow-Origin', $origin);
 		$response->addHeader('Access-Control-Allow-Methods', $this->corsMethods);
-		$response->addHeader('Access-Control-Max-Age', (string)$this->corsMaxAge);
+		$response->addHeader('Access-Control-Max-Age', (string) $this->corsMaxAge);
 		$response->addHeader('Access-Control-Allow-Headers', $this->corsAllowedHeaders);
 		$response->addHeader('Access-Control-Allow-Credentials', 'false');
 		return $response;