nextcloud / server

apps/dav/lib/CalDAV/Plugin.php

Spacing +3 added lines, -3 removed lines

@@ -40,15 +40,15 @@
 	public function getCalendarHomeForPrincipal($principalUrl) {
 		if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::CALENDAR_ROOT . '/' . $principalId;
+			return self::CALENDAR_ROOT.'/'.$principalId;
 		}
 		if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId;
+			return self::SYSTEM_CALENDAR_ROOT.'/calendar-resources/'.$principalId;
 		}
 		if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
-			return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
+			return self::SYSTEM_CALENDAR_ROOT.'/calendar-rooms/'.$principalId;
 		}
 	}
 }

apps/dav/lib/Connector/Sabre/File.php

Spacing +25 added lines, -25 removed lines

@@ -126,7 +126,7 @@ 
 				throw new Forbidden();
 			}
 		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable("File is not updatable: " . $e->getMessage());
+			throw new ServiceUnavailable("File is not updatable: ".$e->getMessage());
 		}
 
 		// verify path of the target
@@ -149,7 +149,7 @@ 
 
 		if ($needsPartFile) {
 			// mark file as partial while uploading (ignored by the scanner)
-			$partFilePath = $this->getPartFileBasePath($this->path) . '.ocTransferId' . rand() . '.part';
+			$partFilePath = $this->getPartFileBasePath($this->path).'.ocTransferId'.rand().'.part';
 
 			if (!$view->isCreatable($partFilePath) && $view->isUpdatable($this->path)) {
 				$needsPartFile = false;
@@ -183,19 +183,19 @@ 
 				$data = $tmpData;
 			}
 
-			$data = HashWrapper::wrap($data, 'md5', function ($hash) {
-				$this->header('X-Hash-MD5: ' . $hash);
+			$data = HashWrapper::wrap($data, 'md5', function($hash) {
+				$this->header('X-Hash-MD5: '.$hash);
 			});
-			$data = HashWrapper::wrap($data, 'sha1', function ($hash) {
-				$this->header('X-Hash-SHA1: ' . $hash);
+			$data = HashWrapper::wrap($data, 'sha1', function($hash) {
+				$this->header('X-Hash-SHA1: '.$hash);
 			});
-			$data = HashWrapper::wrap($data, 'sha256', function ($hash) {
-				$this->header('X-Hash-SHA256: ' . $hash);
+			$data = HashWrapper::wrap($data, 'sha256', function($hash) {
+				$this->header('X-Hash-SHA256: '.$hash);
 			});
 
 			if ($partStorage->instanceOfStorage(Storage\IWriteStreamStorage::class)) {
 				$isEOF = false;
-				$wrappedData = CallbackWrapper::wrap($data, null, null, null, null, function ($stream) use (&$isEOF) {
+				$wrappedData = CallbackWrapper::wrap($data, null, null, null, null, function($stream) use (&$isEOF) {
 					$isEOF = feof($stream);
 				});
 
@@ -225,7 +225,7 @@ 
 					$expected = $_SERVER['CONTENT_LENGTH'];
 				}
 				if ($expected !== "0") {
-					throw new Exception('Error while copying file to target location (copied bytes: ' . $count . ', expected filesize: ' . $expected . ' )');
+					throw new Exception('Error while copying file to target location (copied bytes: '.$count.', expected filesize: '.$expected.' )');
 				}
 			}
 
@@ -233,9 +233,9 @@ 
 			// double check if the file was fully received
 			// compare expected and actual size
 			if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
-				$expected = (int)$_SERVER['CONTENT_LENGTH'];
+				$expected = (int) $_SERVER['CONTENT_LENGTH'];
 				if ($count !== $expected) {
-					throw new BadRequest('Expected filesize of ' . $expected . ' bytes but read (from Nextcloud client) and wrote (to Nextcloud storage) ' . $count . ' bytes. Could either be a network problem on the sending side or a problem writing to the storage on the server side.');
+					throw new BadRequest('Expected filesize of '.$expected.' bytes but read (from Nextcloud client) and wrote (to Nextcloud storage) '.$count.' bytes. Could either be a network problem on the sending side or a problem writing to the storage on the server side.');
 				}
 			}
 		} catch (\Exception $e) {
@@ -284,7 +284,7 @@ 
 					$renameOkay = $storage->moveFromStorage($partStorage, $internalPartPath, $internalPath);
 					$fileExists = $storage->file_exists($internalPath);
 					if ($renameOkay === false || $fileExists === false) {
-						\OC::$server->getLogger()->error('renaming part file to final file failed $renameOkay: ' . ($renameOkay ? 'true' : 'false') . ', $fileExists: ' . ($fileExists ? 'true' : 'false') . ')', ['app' => 'webdav']);
+						\OC::$server->getLogger()->error('renaming part file to final file failed $renameOkay: '.($renameOkay ? 'true' : 'false').', $fileExists: '.($fileExists ? 'true' : 'false').')', ['app' => 'webdav']);
 						throw new Exception('Could not rename part file to final file');
 					}
 				} catch (ForbiddenException $ex) {
@@ -340,10 +340,10 @@ 
 				$this->refreshInfo();
 			}
 		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable("Failed to check file size: " . $e->getMessage(), 0, $e);
+			throw new ServiceUnavailable("Failed to check file size: ".$e->getMessage(), 0, $e);
 		}
 
-		return '"' . $this->info->getEtag() . '"';
+		return '"'.$this->info->getEtag().'"';
 	}
 
 	private function getPartFileBasePath($path) {
@@ -430,9 +430,9 @@ 
 			return $res;
 		} catch (GenericEncryptionException $e) {
 			// returning 503 will allow retry of the operation at a later point in time
-			throw new ServiceUnavailable("Encryption not ready: " . $e->getMessage());
+			throw new ServiceUnavailable("Encryption not ready: ".$e->getMessage());
 		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable("Failed to open file: " . $e->getMessage());
+			throw new ServiceUnavailable("Failed to open file: ".$e->getMessage());
 		} catch (ForbiddenException $ex) {
 			throw new DAVForbiddenException($ex->getMessage(), $ex->getRetry());
 		} catch (LockedException $e) {
@@ -457,7 +457,7 @@ 
 				throw new Forbidden();
 			}
 		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable("Failed to unlink: " . $e->getMessage());
+			throw new ServiceUnavailable("Failed to unlink: ".$e->getMessage());
 		} catch (ForbiddenException $ex) {
 			throw new DAVForbiddenException($ex->getMessage(), $ex->getRetry());
 		} catch (LockedException $e) {
@@ -520,10 +520,10 @@ 
 		//detect aborted upload
 		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
 			if (isset($_SERVER['CONTENT_LENGTH'])) {
-				$expected = (int)$_SERVER['CONTENT_LENGTH'];
+				$expected = (int) $_SERVER['CONTENT_LENGTH'];
 				if ($bytesWritten !== $expected) {
 					$chunk_handler->remove($info['index']);
-					throw new BadRequest('Expected filesize of ' . $expected . ' bytes but read (from Nextcloud client) and wrote (to Nextcloud storage) ' . $bytesWritten . ' bytes. Could either be a network problem on the sending side or a problem writing to the storage on the server side.');
+					throw new BadRequest('Expected filesize of '.$expected.' bytes but read (from Nextcloud client) and wrote (to Nextcloud storage) '.$bytesWritten.' bytes. Could either be a network problem on the sending side or a problem writing to the storage on the server side.');
 				}
 			}
 		}
@@ -534,7 +534,7 @@ 
 			$needsPartFile = $storage->needsPartFile();
 			$partFile = null;
 
-			$targetPath = $path . '/' . $info['name'];
+			$targetPath = $path.'/'.$info['name'];
 			/** @var \OC\Files\Storage\Storage $targetStorage */
 			list($targetStorage, $targetInternalPath) = $this->fileView->resolvePath($targetPath);
 
@@ -550,7 +550,7 @@ 
 
 				if ($needsPartFile) {
 					// we first assembly the target file as a part file
-					$partFile = $this->getPartFileBasePath($path . '/' . $info['name']) . '.ocTransferId' . $info['transferid'] . '.part';
+					$partFile = $this->getPartFileBasePath($path.'/'.$info['name']).'.ocTransferId'.$info['transferid'].'.part';
 					/** @var \OC\Files\Storage\Storage $targetStorage */
 					list($partStorage, $partInternalPath) = $this->fileView->resolvePath($partFile);
 
@@ -654,13 +654,13 @@ 
 		}
 		if ($e instanceof GenericEncryptionException) {
 			// returning 503 will allow retry of the operation at a later point in time
-			throw new ServiceUnavailable('Encryption not ready: ' . $e->getMessage(), 0, $e);
+			throw new ServiceUnavailable('Encryption not ready: '.$e->getMessage(), 0, $e);
 		}
 		if ($e instanceof StorageNotAvailableException) {
-			throw new ServiceUnavailable('Failed to write file contents: ' . $e->getMessage(), 0, $e);
+			throw new ServiceUnavailable('Failed to write file contents: '.$e->getMessage(), 0, $e);
 		}
 		if ($e instanceof NotFoundException) {
-			throw new NotFound('File not found: ' . $e->getMessage(), 0, $e);
+			throw new NotFound('File not found: '.$e->getMessage(), 0, $e);
 		}
 
 		throw new \Sabre\DAV\Exception($e->getMessage(), 0, $e);

apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php

Spacing +7 added lines, -7 removed lines

@@ -167,7 +167,7 @@ 
 	public function getSubscription(string $principalUri, string $uri) {
 		$subscriptions = array_values(array_filter(
 			$this->calDavBackend->getSubscriptionsForUser($principalUri),
-			function ($sub) use ($uri) {
+			function($sub) use ($uri) {
 				return $sub['uri'] === $uri;
 			}
 		));
@@ -193,12 +193,12 @@ 
 		$latestLocation = null;
 
 		$handlerStack = HandlerStack::create();
-		$handlerStack->push(Middleware::mapRequest(function (RequestInterface $request) {
+		$handlerStack->push(Middleware::mapRequest(function(RequestInterface $request) {
 			return $request
 				->withHeader('Accept', 'text/calendar, application/calendar+json, application/calendar+xml')
 				->withHeader('User-Agent', 'Nextcloud Webcal Crawler');
 		}));
-		$handlerStack->push(Middleware::mapResponse(function (ResponseInterface $response) use (&$didBreak301Chain, &$latestLocation) {
+		$handlerStack->push(Middleware::mapResponse(function(ResponseInterface $response) use (&$didBreak301Chain, &$latestLocation) {
 			if (!$didBreak301Chain) {
 				if ($response->getStatusCode() !== 301) {
 					$didBreak301Chain = true;
@@ -372,10 +372,10 @@ 
 		}
 
 		$host = $parsed['host'] ?? '';
-		$port = isset($parsed['port']) ? ':' . $parsed['port'] : '';
+		$port = isset($parsed['port']) ? ':'.$parsed['port'] : '';
 		$path = $parsed['path'] ?? '';
-		$query = isset($parsed['query']) ? '?' . $parsed['query'] : '';
-		$fragment = isset($parsed['fragment']) ? '#' . $parsed['fragment'] : '';
+		$query = isset($parsed['query']) ? '?'.$parsed['query'] : '';
+		$fragment = isset($parsed['fragment']) ? '#'.$parsed['fragment'] : '';
 
 		$cleanURL = "$scheme://$host$port$path$query$fragment";
 		// parse_url is giving some weird results if no url and no :// is given,
@@ -394,6 +394,6 @@ 
 	 * @return string
 	 */
 	public function getRandomCalendarObjectUri():string {
-		return UUIDUtil::getUUID() . '.ics';
+		return UUIDUtil::getUUID().'.ics';
 	}
 }

apps/user_ldap/lib/PagedResults/TLinkId.php

Spacing +2 added lines, -2 removed lines

@@ -28,9 +28,9 @@
 trait TLinkId {
 	public function getLinkId($link) {
 		if (is_resource($link)) {
-			return (int)$link;
+			return (int) $link;
 		} elseif (is_array($link) && isset($link[0]) && is_resource($link[0])) {
-			return (int)$link[0];
+			return (int) $link[0];
 		}
 		throw new \RuntimeException('No resource provided');
 	}

apps/dav/lib/CardDAV/AddressBookImpl.php

Spacing +5 added lines, -5 removed lines

@@ -135,7 +135,7 @@ 
 		$update = false;
 		if (!isset($properties['URI'])) { // create a new contact
 			$uid = $this->createUid();
-			$uri = $uid . '.vcf';
+			$uri = $uid.'.vcf';
 			$vCard = $this->createEmptyVCard($uid);
 		} else { // update existing contact
 			$uri = $properties['URI'];
@@ -210,7 +210,7 @@ 
 	protected function createUid() {
 		do {
 			$uid = $this->getUid();
-			$contact = $this->backend->getContact($this->getKey(), $uid . '.vcf');
+			$contact = $this->backend->getContact($this->getKey(), $uid.'.vcf');
 		} while (!empty($contact));
 
 		return $uid;
@@ -251,15 +251,15 @@ 
 		foreach ($vCard->children() as $property) {
 			if ($property->name === 'PHOTO' && $property->getValueType() === 'BINARY') {
 				$url = $this->urlGenerator->getAbsoluteURL(
-					$this->urlGenerator->linkTo('', 'remote.php') . '/dav/');
+					$this->urlGenerator->linkTo('', 'remote.php').'/dav/');
 				$url .= implode('/', [
 					'addressbooks',
 					substr($this->addressBookInfo['principaluri'], 11), //cut off 'principals/'
 					$this->addressBookInfo['uri'],
 					$uri
-				]) . '?photo';
+				]).'?photo';
 
-				$result['PHOTO'] = 'VALUE=uri:' . $url;
+				$result['PHOTO'] = 'VALUE=uri:'.$url;
 			} elseif (in_array($property->name, ['URL', 'GEO', 'CLOUD', 'ADR', 'EMAIL', 'IMPP', 'TEL', 'X-SOCIALPROFILE', 'RELATED', 'LANG', 'X-ADDRESSBOOKSERVER-MEMBER'])) {
 				if (!isset($result[$property->name])) {
 					$result[$property->name] = [];

apps/dav/lib/CardDAV/HasPhotoPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 		$ns = '{http://nextcloud.com/ns}';
 
 		if ($node instanceof Card) {
-			$propFind->handle($ns . 'has-photo', function () use ($node) {
+			$propFind->handle($ns.'has-photo', function() use ($node) {
 				$vcard = Reader::read($node->get());
 				return $vcard instanceof VCard
 					&& $vcard->PHOTO

lib/private/Preview/BackgroundCleanupJob.php

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 	public function run($argument) {
 		foreach ($this->getDeletedFiles() as $fileId) {
 			try {
-				$preview = $this->previewFolder->getFolder((string)$fileId);
+				$preview = $this->previewFolder->getFolder((string) $fileId);
 				$preview->delete();
 			} catch (NotFoundException $e) {
 				// continue
@@ -125,7 +125,7 @@ 
 		 * We take the md5 of the name (fileid) and split the first 7 chars. That way
 		 * there are not a gazillion files in the root of the preview appdata.
 		 */
-		$like = $this->connection->escapeLikeParameter($data['path']) . '/_/_/_/_/_/_/_/%';
+		$like = $this->connection->escapeLikeParameter($data['path']).'/_/_/_/_/_/_/_/%';
 
 		$qb = $this->connection->getQueryBuilder();
 		$qb->select('a.name')

lib/private/Files/Storage/Wrapper/Encryption.php

Spacing +15 added lines, -15 removed lines

@@ -205,7 +205,7 @@ 
 	public function getDirectoryContent($directory): \Traversable {
 		$parent = rtrim($directory, '/');
 		foreach ($this->getWrapperStorage()->getDirectoryContent($directory) as $data) {
-			yield $this->modifyMetaData($parent . '/' . $data['name'], $data);
+			yield $this->modifyMetaData($parent.'/'.$data['name'], $data);
 		}
 	}
 
@@ -377,8 +377,8 @@ 
 		// check if the file is stored in the array cache, this means that we
 		// copy a file over to the versions folder, in this case we don't want to
 		// decrypt it
-		if ($this->arrayCache->hasKey('encryption_copy_version_' . $path)) {
-			$this->arrayCache->remove('encryption_copy_version_' . $path);
+		if ($this->arrayCache->hasKey('encryption_copy_version_'.$path)) {
+			$this->arrayCache->remove('encryption_copy_version_'.$path);
 			return $this->storage->fopen($path, $mode);
 		}
 
@@ -451,7 +451,7 @@ 
 				}
 			} catch (ModuleDoesNotExistsException $e) {
 				$this->logger->logException($e, [
-					'message' => 'Encryption module "' . $encryptionModuleId . '" not found, file will be stored unencrypted',
+					'message' => 'Encryption module "'.$encryptionModuleId.'" not found, file will be stored unencrypted',
 					'level' => ILogger::WARN,
 					'app' => 'core',
 				]);
@@ -504,7 +504,7 @@ 
 				try {
 					$result = $this->fixUnencryptedSize($path, $size, $unencryptedSize);
 				} catch (\Exception $e) {
-					$this->logger->error('Couldn\'t re-calculate unencrypted size for ' . $path);
+					$this->logger->error('Couldn\'t re-calculate unencrypted size for '.$path);
 					$this->logger->logException($e);
 				}
 				unset($this->fixUnencryptedSizeOf[$this->getFullPath($path)]);
@@ -532,7 +532,7 @@ 
 
 		// if we couldn't open the file we return the old unencrypted size
 		if (!is_resource($stream)) {
-			$this->logger->error('Could not open ' . $path . '. Recalculation of unencrypted size aborted.');
+			$this->logger->error('Could not open '.$path.'. Recalculation of unencrypted size aborted.');
 			return $unencryptedSize;
 		}
 
@@ -582,8 +582,8 @@ 
 
 		// we have to decrypt the last chunk to get it actual size
 		$encryptionModule->begin($this->getFullPath($path), $this->uid, 'r', $header, []);
-		$decryptedLastChunk = $encryptionModule->decrypt($lastChunkContentEncrypted, $lastChunkNr . 'end');
-		$decryptedLastChunk .= $encryptionModule->end($this->getFullPath($path), $lastChunkNr . 'end');
+		$decryptedLastChunk = $encryptionModule->decrypt($lastChunkContentEncrypted, $lastChunkNr.'end');
+		$decryptedLastChunk .= $encryptionModule->end($this->getFullPath($path), $lastChunkNr.'end');
 
 		// calc the real file size with the size of the last chunk
 		$newUnencryptedSize += strlen($decryptedLastChunk);
@@ -711,9 +711,9 @@ 
 			// remember that we try to create a version so that we can detect it during
 			// fopen($sourceInternalPath) and by-pass the encryption in order to
 			// create a 1:1 copy of the file
-			$this->arrayCache->set('encryption_copy_version_' . $sourceInternalPath, true);
+			$this->arrayCache->set('encryption_copy_version_'.$sourceInternalPath, true);
 			$result = $this->storage->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-			$this->arrayCache->remove('encryption_copy_version_' . $sourceInternalPath);
+			$this->arrayCache->remove('encryption_copy_version_'.$sourceInternalPath);
 			if ($result) {
 				$info = $this->getCache('', $sourceStorage)->get($sourceInternalPath);
 				// make sure that we update the unencrypted size for the version
@@ -733,7 +733,7 @@ 
 		$mount = $this->mountManager->findByStorageId($sourceStorage->getId());
 		if (count($mount) === 1) {
 			$mountPoint = $mount[0]->getMountPoint();
-			$source = $mountPoint . '/' . $sourceInternalPath;
+			$source = $mountPoint.'/'.$sourceInternalPath;
 			$target = $this->getFullPath($targetInternalPath);
 			$this->copyKeys($source, $target);
 		} else {
@@ -746,7 +746,7 @@ 
 			if (is_resource($dh)) {
 				while ($result and ($file = readdir($dh)) !== false) {
 					if (!Filesystem::isIgnoredDir($file)) {
-						$result &= $this->copyFromStorage($sourceStorage, $sourceInternalPath . '/' . $file, $targetInternalPath . '/' . $file, false, $isRename);
+						$result &= $this->copyFromStorage($sourceStorage, $sourceInternalPath.'/'.$file, $targetInternalPath.'/'.$file, false, $isRename);
 					}
 				}
 			}
@@ -774,7 +774,7 @@ 
 				$this->getCache()->remove($targetInternalPath);
 			}
 		}
-		return (bool)$result;
+		return (bool) $result;
 	}
 
 	/**
@@ -844,7 +844,7 @@ 
 	 * @return string full path including mount point
 	 */
 	protected function getFullPath($path) {
-		return Filesystem::normalizePath($this->mountPoint . '/' . $path);
+		return Filesystem::normalizePath($this->mountPoint.'/'.$path);
 	}
 
 	/**
@@ -963,7 +963,7 @@ 
 			try {
 				$encryptionModule = $this->encryptionManager->getEncryptionModule($encryptionModuleId);
 			} catch (ModuleDoesNotExistsException $e) {
-				$this->logger->critical('Encryption module defined in "' . $path . '" not loaded!');
+				$this->logger->critical('Encryption module defined in "'.$path.'" not loaded!');
 				throw $e;
 			}
 		}

lib/public/AppFramework/AuthPublicShareController.php

Spacing +1 added lines, -1 removed lines

@@ -168,7 +168,7 @@
 		if (substr($class, -10) === 'Controller') {
 			$class = substr($class, 0, -10);
 		}
-		return $app .'.'. $class .'.'. $function;
+		return $app.'.'.$class.'.'.$function;
 	}
 
 	/**