nextcloud / server

lib/private/DateTimeZone.php

Spacing +4 added lines, -4 removed lines

@@ -65,7 +65,7 @@ 
 		try {
 			return new \DateTimeZone($timeZone);
 		} catch (\Exception $e) {
-			\OCP\Util::writeLog('datetimezone', 'Failed to created DateTimeZone "' . $timeZone . "'", ILogger::DEBUG);
+			\OCP\Util::writeLog('datetimezone', 'Failed to created DateTimeZone "'.$timeZone."'", ILogger::DEBUG);
 			return new \DateTimeZone($this->getDefaultTimeZone());
 		}
 	}
@@ -86,9 +86,9 @@ 
 			// so a positive offset means negative timeZone
 			// and the other way around.
 			if ($offset > 0) {
-				$timeZone = 'Etc/GMT-' . $offset;
+				$timeZone = 'Etc/GMT-'.$offset;
 			} else {
-				$timeZone = 'Etc/GMT+' . abs($offset);
+				$timeZone = 'Etc/GMT+'.abs($offset);
 			}
 
 			return new \DateTimeZone($timeZone);
@@ -110,7 +110,7 @@ 
 			}
 
 			// No timezone found, fallback to UTC
-			\OCP\Util::writeLog('datetimezone', 'Failed to find DateTimeZone for offset "' . $offset . "'", ILogger::DEBUG);
+			\OCP\Util::writeLog('datetimezone', 'Failed to find DateTimeZone for offset "'.$offset."'", ILogger::DEBUG);
 			return new \DateTimeZone($this->getDefaultTimeZone());
 		}
 	}

lib/private/Files/Mount/MountPoint.php

Spacing +5 added lines, -5 removed lines

@@ -106,7 +106,7 @@ 
 		} else {
 			// Update old classes to new namespace
 			if (strpos($storage, 'OC_Filestorage_') !== false) {
-				$storage = '\OC\Files\Storage\\' . substr($storage, 15);
+				$storage = '\OC\Files\Storage\\'.substr($storage, 15);
 			}
 			$this->class = $storage;
 			$this->arguments = $arguments;
@@ -158,7 +158,7 @@ 
 				return;
 			}
 		} else {
-			\OCP\Util::writeLog('core', 'storage backend ' . $this->class . ' not found', ILogger::ERROR);
+			\OCP\Util::writeLog('core', 'storage backend '.$this->class.' not found', ILogger::ERROR);
 			$this->invalidStorage = true;
 			return;
 		}
@@ -208,13 +208,13 @@ 
 	 */
 	public function getInternalPath($path) {
 		$path = Filesystem::normalizePath($path, true, false, true);
-		if ($this->mountPoint === $path or $this->mountPoint . '/' === $path) {
+		if ($this->mountPoint === $path or $this->mountPoint.'/' === $path) {
 			$internalPath = '';
 		} else {
 			$internalPath = substr($path, strlen($this->mountPoint));
 		}
 		// substr returns false instead of an empty string, we always want a string
-		return (string)$internalPath;
+		return (string) $internalPath;
 	}
 
 	/**
@@ -267,7 +267,7 @@ 
 	 */
 	public function getStorageRootId() {
 		if (is_null($this->rootId)) {
-			$this->rootId = (int)$this->getStorage()->getCache()->getId('');
+			$this->rootId = (int) $this->getStorage()->getCache()->getId('');
 		}
 		return $this->rootId;
 	}

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

Spacing +24 added lines, -24 removed lines

@@ -368,8 +368,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);
 		}
 
@@ -440,7 +440,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',
 				]);
@@ -495,7 +495,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)]);
@@ -524,7 +524,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;
 		}
 
@@ -549,7 +549,7 @@ 
 		// next highest is end of chunks, one subtracted is last one
 		// we have to read the last chunk, we can't just calculate it (because of padding etc)
 
-		$lastChunkNr = ceil($size/ $blockSize)-1;
+		$lastChunkNr = ceil($size / $blockSize) - 1;
 		// calculate last chunk position
 		$lastChunkPos = ($lastChunkNr * $blockSize);
 		// try to fseek to the last chunk, if it fails we have to read the whole file
@@ -557,16 +557,16 @@ 
 			$newUnencryptedSize += $lastChunkNr * $unencryptedBlockSize;
 		}
 
-		$lastChunkContentEncrypted='';
+		$lastChunkContentEncrypted = '';
 		$count = $blockSize;
 
 		while ($count > 0) {
-			$data=fread($stream, $blockSize);
-			$count=strlen($data);
+			$data = fread($stream, $blockSize);
+			$count = strlen($data);
 			$lastChunkContentEncrypted .= $data;
-			if(strlen($lastChunkContentEncrypted) > $blockSize) {
+			if (strlen($lastChunkContentEncrypted) > $blockSize) {
 				$newUnencryptedSize += $unencryptedBlockSize;
-				$lastChunkContentEncrypted=substr($lastChunkContentEncrypted, $blockSize);
+				$lastChunkContentEncrypted = substr($lastChunkContentEncrypted, $blockSize);
 			}
 		}
 
@@ -574,8 +574,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);
@@ -659,7 +659,7 @@ 
 		$cacheInformation = [
 			'encrypted' => $isEncrypted,
 		];
-		if($isEncrypted) {
+		if ($isEncrypted) {
 			$encryptedVersion = $sourceStorage->getCache()->get($sourceInternalPath)['encryptedVersion'];
 
 			// In case of a move operation from an unencrypted to an encrypted
@@ -667,7 +667,7 @@ 
 			// correct value would be "1". Thus we manually set the value to "1"
 			// for those cases.
 			// See also https://github.com/owncloud/core/issues/23078
-			if($encryptedVersion === 0 || !$keepEncryptionVersion) {
+			if ($encryptedVersion === 0 || !$keepEncryptionVersion) {
 				$encryptedVersion = 1;
 			}
 
@@ -703,9 +703,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
@@ -725,7 +725,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 {
@@ -738,7 +738,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);
 					}
 				}
 			}
@@ -754,7 +754,7 @@ 
 				fclose($target);
 				throw $e;
 			}
-			if($result) {
+			if ($result) {
 				if ($preserveMtime) {
 					$this->touch($targetInternalPath, $sourceStorage->filemtime($sourceInternalPath));
 				}
@@ -766,7 +766,7 @@ 
 				$this->getCache()->remove($targetInternalPath);
 			}
 		}
-		return (bool)$result;
+		return (bool) $result;
 
 	}
 
@@ -837,7 +837,7 @@ 
 	 * @return string full path including mount point
 	 */
 	protected function getFullPath($path) {
-		return Filesystem::normalizePath($this->mountPoint . '/' . $path);
+		return Filesystem::normalizePath($this->mountPoint.'/'.$path);
 	}
 
 	/**
@@ -893,7 +893,7 @@ 
 				$header = substr($header, 0, $endAt + strlen(Util::HEADER_END));
 
 				// +1 to not start with an ':' which would result in empty element at the beginning
-				$exploded = explode(':', substr($header, strlen(Util::HEADER_START)+1));
+				$exploded = explode(':', substr($header, strlen(Util::HEADER_START) + 1));
 
 				$element = array_shift($exploded);
 				while ($element !== Util::HEADER_END) {
@@ -956,7 +956,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/ILogger.php

Spacing +5 added lines, -5 removed lines

@@ -39,23 +39,23 @@
 	/**
 	 * @since 14.0.0
 	 */
-	const DEBUG=0;
+	const DEBUG = 0;
 	/**
 	 * @since 14.0.0
 	 */
-	const INFO=1;
+	const INFO = 1;
 	/**
 	 * @since 14.0.0
 	 */
-	const WARN=2;
+	const WARN = 2;
 	/**
 	 * @since 14.0.0
 	 */
-	const ERROR=3;
+	const ERROR = 3;
 	/**
 	 * @since 14.0.0
 	 */
-	const FATAL=4;
+	const FATAL = 4;
 
 	/**
 	 * System is unusable.

lib/public/Log/IFileBased.php

Spacing +1 added lines, -1 removed lines

@@ -39,5 +39,5 @@
 	/**
 	 * @since 14.0.0
 	 */
-	public function getEntries(int $limit=50, int $offset=0): array;
+	public function getEntries(int $limit = 50, int $offset = 0): array;
 }

apps/federation/lib/BackgroundJob/GetSharedSecret.php

Spacing +9 added lines, -9 removed lines

@@ -145,7 +145,7 @@ 
 
 	protected function run($argument) {
 		$target = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->timeFactory->getTime();
+		$created = isset($argument['created']) ? (int) $argument['created'] : $this->timeFactory->getTime();
 		$currentTime = $this->timeFactory->getTime();
 		$source = $this->urlGenerator->getAbsoluteURL('/');
 		$source = rtrim($source, '/');
@@ -155,7 +155,7 @@ 
 		$deadline = $currentTime - $this->maxLifespan;
 		if ($created < $deadline) {
 			$this->retainJob = false;
-			$this->trustedServers->setServerStatus($target,TrustedServers::STATUS_FAILURE);
+			$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
 			return;
 		}
 
@@ -163,7 +163,7 @@ 
 		$endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
 
 		// make sure that we have a well formatted url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/');
+		$url = rtrim($target, '/').'/'.trim($endPoint, '/');
 
 		$result = null;
 		try {
@@ -186,21 +186,21 @@ 
 		} catch (ClientException $e) {
 			$status = $e->getCode();
 			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to exchange a shared secret with you.', ['app' => 'federation']);
+				$this->logger->info($target.' refused to exchange a shared secret with you.', ['app' => 'federation']);
 			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
+				$this->logger->info($target.' responded with a '.$status.' containing: '.$e->getMessage(), ['app' => 'federation']);
 			}
 		} catch (RequestException $e) {
 			$status = -1; // There is no status code if we could not connect
 			$this->logger->logException($e, [
-				'message' => 'Could not connect to ' . $target,
+				'message' => 'Could not connect to '.$target,
 				'level' => ILogger::INFO,
 				'app' => 'federation',
 			]);
 		} catch (RingException $e) {
 			$status = -1; // There is no status code if we could not connect
 			$this->logger->logException($e, [
-				'message' => 'Could not connect to ' . $target,
+				'message' => 'Could not connect to '.$target,
 				'level' => ILogger::INFO,
 				'app' => 'federation',
 			]);
@@ -227,7 +227,7 @@ 
 				);
 			} else {
 				$this->logger->error(
-						'remote server "' . $target . '"" does not return a valid shared secret. Received data: ' . $body,
+						'remote server "'.$target.'"" does not return a valid shared secret. Received data: '.$body,
 						['app' => 'federation']
 				);
 				$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
@@ -243,7 +243,7 @@ 
 	 */
 	protected function reAddJob(array $argument) {
 		$url = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->timeFactory->getTime();
+		$created = isset($argument['created']) ? (int) $argument['created'] : $this->timeFactory->getTime();
 		$token = $argument['token'];
 		$this->jobList->add(
 			GetSharedSecret::class,

lib/private/Log/Rotate.php

Spacing +2 added lines, -2 removed lines

@@ -37,10 +37,10 @@
 
 	public function run($dummy) {
 		$systemConfig = \OC::$server->getSystemConfig();
-		$this->filePath = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log');
+		$this->filePath = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT.'/data').'/nextcloud.log');
 
 		$this->maxSize = \OC::$server->getConfig()->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
-		if($this->shouldRotateBySize()) {
+		if ($this->shouldRotateBySize()) {
 			$rotatedFile = $this->rotate();
 			$msg = 'Log file "'.$this->filePath.'" was over '.$this->maxSize.' bytes, moved to "'.$rotatedFile.'"';
 			\OC::$server->getLogger()->warning($msg, ['app' => Rotate::class]);

lib/public/Log/RotationTrait.php

Spacing +2 added lines, -2 removed lines

@@ -59,9 +59,9 @@
 	 * @since 14.0.0
 	 */
 	protected function shouldRotateBySize():bool {
-		if ((int)$this->maxSize > 0) {
+		if ((int) $this->maxSize > 0) {
 			$filesize = @filesize($this->filePath);
-			if ($filesize >= (int)$this->maxSize) {
+			if ($filesize >= (int) $this->maxSize) {
 				return true;
 			}
 		}

apps/admin_audit/lib/AppInfo/Application.php

Spacing +11 added lines, -11 removed lines

@@ -65,9 +65,9 @@ 
 		$c = $this->getContainer()->getServer();
 		$config = $c->getConfig();
 
-		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/audit.log';
 		$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
-		if($logFile === null) {
+		if ($logFile === null) {
 			$this->logger = $c->getLogger();
 			return;
 		}
@@ -102,9 +102,9 @@ 
 	protected function userManagementHooks() {
 		$userActions = new UserManagement($this->logger);
 
-		Util::connectHook('OC_User', 'post_createUser',	$userActions, 'create');
-		Util::connectHook('OC_User', 'post_deleteUser',	$userActions, 'delete');
-		Util::connectHook('OC_User', 'changeUser',	$userActions, 'change');
+		Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
+		Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
+		Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
 
 		/** @var IUserSession|Session $userSession */
 		$userSession = $this->getContainer()->getServer()->getUserSession();
@@ -113,15 +113,15 @@ 
 		$userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
 	}
 
-	protected function groupHooks()  {
+	protected function groupHooks() {
 		$groupActions = new GroupManagement($this->logger);
 
 		/** @var IGroupManager|Manager $groupManager */
 		$groupManager = $this->getContainer()->getServer()->getGroupManager();
-		$groupManager->listen('\OC\Group', 'postRemoveUser',  [$groupActions, 'removeUser']);
-		$groupManager->listen('\OC\Group', 'postAddUser',  [$groupActions, 'addUser']);
-		$groupManager->listen('\OC\Group', 'postDelete',  [$groupActions, 'deleteGroup']);
-		$groupManager->listen('\OC\Group', 'postCreate',  [$groupActions, 'createGroup']);
+		$groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
+		$groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
+		$groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']);
+		$groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
 	}
 
 	protected function sharingHooks() {
@@ -234,7 +234,7 @@ 
 	protected function versionsHooks() {
 		$versionsActions = new Versions($this->logger);
 		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
-		Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
+		Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
 	}
 
 	protected function trashbinHooks() {