nextcloud / server

apps/settings/templates/settings/admin/server.php

Spacing +12 added lines, -12 removed lines

@@ -27,7 +27,7 @@ 
 ?>
 
 <div class="section" id="backgroundjobs">
-	<h2 class="inlineblock"><?php p($l->t('Background jobs'));?></h2>
+	<h2 class="inlineblock"><?php p($l->t('Background jobs')); ?></h2>
 	<p class="cronlog inlineblock">
 		<?php if ($_['lastcron'] !== false) {
 	$relative_time = relative_modified_date($_['lastcron']);
@@ -38,25 +38,25 @@ 
 	$maxAgeAbsoluteTime = $formatter->formatDateTime($_['cronMaxAge'], 'long', 'long');
 	if (time() - $_['lastcron'] > 600) { ?>
 				<span class="status error"></span>
-				<span class="crondate" title="<?php p($absolute_time);?>">
-					<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
+				<span class="crondate" title="<?php p($absolute_time); ?>">
+					<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time])); ?>
 				</span>
 			<?php } elseif (time() - $_['cronMaxAge'] > 12 * 3600) {
 		if ($_['backgroundjobs_mode'] === 'cron') { ?>
 						<span class="status warning"></span>
-						<span class="crondate" title="<?php p($maxAgeAbsoluteTime);?>">
-							<?php p($l->t("Some jobs haven’t been executed since %s. Please consider increasing the execution frequency.", [$maxAgeRelativeTime]));?>
+						<span class="crondate" title="<?php p($maxAgeAbsoluteTime); ?>">
+							<?php p($l->t("Some jobs haven’t been executed since %s. Please consider increasing the execution frequency.", [$maxAgeRelativeTime])); ?>
 						</span>
 					<?php } else { ?>
 						<span class="status error"></span>
-						<span class="crondate" title="<?php p($maxAgeAbsoluteTime);?>">
-							<?php p($l->t("Some jobs didn’t execute since %s. Please consider switching to system cron.", [$maxAgeRelativeTime]));?>
+						<span class="crondate" title="<?php p($maxAgeAbsoluteTime); ?>">
+							<?php p($l->t("Some jobs didn’t execute since %s. Please consider switching to system cron.", [$maxAgeRelativeTime])); ?>
 						</span>
 					<?php }
 	} else { ?>
 				<span class="status success"></span>
-				<span class="crondate" title="<?php p($absolute_time);?>">
-					<?php p($l->t("Last job ran %s.", [$relative_time]));?>
+				<span class="crondate" title="<?php p($absolute_time); ?>">
+					<?php p($l->t("Last job ran %s.", [$relative_time])); ?>
 				</span>
 			<?php }
 } else { ?>
@@ -65,13 +65,13 @@ 
 		} ?>
 	</p>
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"
-	   title="<?php p($l->t('Open documentation'));?>"
+	   title="<?php p($l->t('Open documentation')); ?>"
 	   href="<?php p(link_to_docs('admin-background-jobs')); ?>"></a>
 
-	<p class="settings-hint"><?php p($l->t('For optimal performance it\'s important to configure background jobs correctly. For bigger instances \'Cron\' is the recommended setting. Please see the documentation for more information.'));?></p>
+	<p class="settings-hint"><?php p($l->t('For optimal performance it\'s important to configure background jobs correctly. For bigger instances \'Cron\' is the recommended setting. Please see the documentation for more information.')); ?></p>
 	<form action="#">
 		<fieldset>
-			<legend class="hidden-visually"><?php p($l->t('Pick background job setting'));?></legend>
+			<legend class="hidden-visually"><?php p($l->t('Pick background job setting')); ?></legend>
 			<p>
 				<input type="radio" name="mode" value="ajax" class="radio"
 					   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {

apps/settings/lib/Settings/Admin/Server.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 			'cronMaxAge' => $this->cronMaxAge(),
 			'cronErrors' => $this->config->getAppValue('core', 'cronErrors'),
 			'cli_based_cron_possible' => function_exists('posix_getpwuid'),
-			'cli_based_cron_user' => function_exists('posix_getpwuid') ? posix_getpwuid(fileowner(\OC::$configDir . 'config.php'))['name'] : '',
+			'cli_based_cron_user' => function_exists('posix_getpwuid') ? posix_getpwuid(fileowner(\OC::$configDir.'config.php'))['name'] : '',
 		];
 
 		return new TemplateResponse('settings', 'settings/admin/server', $parameters, '');

apps/workflowengine/lib/BackgroundJobs/Rotate.php

Spacing +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
 
 	protected function run($argument) {
 		$config = \OC::$server->getConfig();
-		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/flow.log';
-		$this->filePath = trim((string)$config->getAppValue(Application::APP_ID, 'logfile', $default));
+		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/flow.log';
+		$this->filePath = trim((string) $config->getAppValue(Application::APP_ID, 'logfile', $default));
 
 		if ($this->filePath === '') {
 			// disabled, nothing to do

apps/accessibility/lib/Controller/AccessibilityController.php

Spacing +12 added lines, -12 removed lines

@@ -149,15 +149,15 @@ 
 				if ($scssFile === 'highcontrast' && in_array('dark', $userValues)) {
 					$scssFile .= 'dark';
 				}
-				$imports .= '@import "' . $scssFile . '";';
+				$imports .= '@import "'.$scssFile.'";';
 			}
 		}
 
 		if ($imports !== '') {
 			$scss = new Compiler();
 			$scss->setImportPaths([
-				$this->appRoot . '/css/',
-				$this->serverRoot . '/core/css/'
+				$this->appRoot.'/css/',
+				$this->serverRoot.'/core/css/'
 			]);
 
 			// Continue after throw
@@ -167,9 +167,9 @@ 
 			// Import theme, variables and compile css4 variables
 			try {
 				$css .= $scss->compile(
-					$imports .
-					$this->getInjectedVariables() .
-					'@import "variables.scss";' .
+					$imports.
+					$this->getInjectedVariables().
+					'@import "variables.scss";'.
 					'@import "css-variables.scss";'
 				);
 			} catch (ParserException $e) {
@@ -182,21 +182,21 @@ 
 
 		// Rebase all urls
 		$appWebRoot = substr($this->appRoot, strlen($this->serverRoot) - strlen(\OC::$WEBROOT));
-		$css = $this->rebaseUrls($css, $appWebRoot . '/css');
+		$css = $this->rebaseUrls($css, $appWebRoot.'/css');
 
 		if (in_array('dark', $userValues) && $this->iconsCacher->getCachedList() && $this->iconsCacher->getCachedList()->getSize() > 0) {
 			$iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedList()->getContent());
-			$css = $css . $iconsCss;
+			$css = $css.$iconsCss;
 		}
 
 		$response = new DataDisplayResponse($css, Http::STATUS_OK, ['Content-Type' => 'text/css']);
 
 		// Set cache control
 		$ttl = 31536000;
-		$response->addHeader('Cache-Control', 'max-age=' . $ttl . ', immutable');
+		$response->addHeader('Cache-Control', 'max-age='.$ttl.', immutable');
 		$expires = new \DateTime();
 		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT' . $ttl . 'S'));
+		$expires->add(new \DateInterval('PT'.$ttl.'S'));
 		$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
 		$response->addHeader('Pragma', 'cache');
 
@@ -241,7 +241,7 @@ 
 	 */
 	private function rebaseUrls(string $css, string $webDir): string {
 		$re = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
-		$subst = 'url(\'' . $webDir . '/$1\')';
+		$subst = 'url(\''.$webDir.'/$1\')';
 
 		return preg_replace($re, $subst, $css);
 	}
@@ -273,7 +273,7 @@ 
 		}
 		$variables = '';
 		foreach ($this->defaults->getScssVariables() as $key => $value) {
-			$variables .= '$' . $key . ': ' . $value . ';';
+			$variables .= '$'.$key.': '.$value.';';
 		}
 
 		// check for valid variables / otherwise fall back to defaults

lib/private/OCS/DiscoveryService.php

Spacing +4 added lines, -4 removed lines

@@ -69,7 +69,7 @@ 
 	public function discover(string $remote, string $service, bool $skipCache = false): array {
 		// Check the cache first
 		if ($skipCache === false) {
-			$cacheData = $this->cache->get($remote . '#' . $service);
+			$cacheData = $this->cache->get($remote.'#'.$service);
 			if ($cacheData) {
 				$data = json_decode($cacheData, true);
 				if (\is_array($data)) {
@@ -82,7 +82,7 @@ 
 
 		// query the remote server for available services
 		try {
-			$response = $this->client->get($remote . '/ocs-provider/', [
+			$response = $this->client->get($remote.'/ocs-provider/', [
 				'timeout' => 10,
 				'connect_timeout' => 10,
 			]);
@@ -97,7 +97,7 @@ 
 		}
 
 		// Write into cache
-		$this->cache->set($remote . '#' . $service, json_encode($discoveredServices), 60 * 60 * 24);
+		$this->cache->set($remote.'#'.$service, json_encode($discoveredServices), 60 * 60 * 24);
 		return $discoveredServices;
 	}
 
@@ -130,6 +130,6 @@ 
 	 * @return bool
 	 */
 	protected function isSafeUrl(string $url): bool {
-		return (bool)preg_match('/^[\/\.\-A-Za-z0-9]+$/', $url);
+		return (bool) preg_match('/^[\/\.\-A-Za-z0-9]+$/', $url);
 	}
 }

lib/private/Security/Bruteforce/Throttler.php

Spacing +8 added lines, -8 removed lines

@@ -93,7 +93,7 @@ 
 	private function getCutoff(int $expire): \DateInterval {
 		$d1 = new \DateTime();
 		$d2 = clone $d1;
-		$d2->sub(new \DateInterval('PT' . $expire . 'S'));
+		$d2->sub(new \DateInterval('PT'.$expire.'S'));
 		return $d2->diff($d1);
 	}
 
@@ -128,7 +128,7 @@ 
 		$values = [
 			'action' => $action,
 			'occurred' => $this->timeFactory->getTime(),
-			'ip' => (string)$ipAddress,
+			'ip' => (string) $ipAddress,
 			'subnet' => $ipAddress->getSubnet(),
 			'metadata' => json_encode($metadata),
 		];
@@ -164,7 +164,7 @@ 
 		}
 
 		$keys = $this->config->getAppKeys('bruteForce');
-		$keys = array_filter($keys, function ($key) {
+		$keys = array_filter($keys, function($key) {
 			return 0 === strpos($key, 'whitelist_');
 		});
 
@@ -183,7 +183,7 @@ 
 
 			$cx = explode('/', $cidr);
 			$addr = $cx[0];
-			$mask = (int)$cx[1];
+			$mask = (int) $cx[1];
 
 			// Do not compare ipv4 to ipv6
 			if (($type === 4 && !filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ||
@@ -195,8 +195,8 @@ 
 
 			$valid = true;
 			for ($i = 0; $i < $mask; $i++) {
-				$part = ord($addr[(int)($i / 8)]);
-				$orig = ord($ip[(int)($i / 8)]);
+				$part = ord($addr[(int) ($i / 8)]);
+				$orig = ord($ip[(int) ($i / 8)]);
 
 				$bitmask = 1 << (7 - ($i % 8));
 
@@ -231,7 +231,7 @@ 
 		}
 
 		$ipAddress = new IpAddress($ip);
-		if ($this->isIPWhitelisted((string)$ipAddress)) {
+		if ($this->isIPWhitelisted((string) $ipAddress)) {
 			return 0;
 		}
 
@@ -289,7 +289,7 @@ 
 	 */
 	public function resetDelay(string $ip, string $action, array $metadata): void {
 		$ipAddress = new IpAddress($ip);
-		if ($this->isIPWhitelisted((string)$ipAddress)) {
+		if ($this->isIPWhitelisted((string) $ipAddress)) {
 			return;
 		}
 

lib/private/User/Backend.php

Spacing +9 added lines, -9 removed lines

@@ -39,14 +39,14 @@ 
 	/**
 	 * actions that user backends can define
 	 */
-	public const CREATE_USER = 1;			// 1 << 0
-	public const SET_PASSWORD = 16;			// 1 << 4
-	public const CHECK_PASSWORD = 256;			// 1 << 8
-	public const GET_HOME = 4096;			// 1 << 12
-	public const GET_DISPLAYNAME = 65536;		// 1 << 16
-	public const SET_DISPLAYNAME = 1048576;		// 1 << 20
-	public const PROVIDE_AVATAR = 16777216;		// 1 << 24
-	public const COUNT_USERS = 268435456;	// 1 << 28
+	public const CREATE_USER = 1; // 1 << 0
+	public const SET_PASSWORD = 16; // 1 << 4
+	public const CHECK_PASSWORD = 256; // 1 << 8
+	public const GET_HOME = 4096; // 1 << 12
+	public const GET_DISPLAYNAME = 65536; // 1 << 16
+	public const SET_DISPLAYNAME = 1048576; // 1 << 20
+	public const PROVIDE_AVATAR = 16777216; // 1 << 24
+	public const COUNT_USERS = 268435456; // 1 << 28
 
 	protected $possibleActions = [
 		self::CREATE_USER => 'createUser',
@@ -86,7 +86,7 @@ 
 	 * compared with self::CREATE_USER etc.
 	 */
 	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
+		return (bool) ($this->getSupportedActions() & $actions);
 	}
 
 	/**

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();