nextcloud / server

lib/private/Setup.php

Spacing +19 added lines, -19 removed lines

@@ -208,7 +208,7 @@ 
 	public function getSystemInfo($allowAllDatabases = false) {
 		$databases = $this->getSupportedDatabases($allowAllDatabases);
 
-		$dataDir = $this->config->getValue('datadirectory', \OC::$SERVERROOT . '/data');
+		$dataDir = $this->config->getValue('datadirectory', \OC::$SERVERROOT.'/data');
 
 		$errors = [];
 
@@ -239,7 +239,7 @@ 
 		if (\OC_Util::runningOnMac()) {
 			$errors[] = [
 				'error' => $this->l10n->t(
-					'Mac OS X is not supported and %s will not work properly on this platform. ' .
+					'Mac OS X is not supported and %s will not work properly on this platform. '.
 					'Use it at your own risk! ',
 					[$this->defaults->getProductName()]
 				),
@@ -250,7 +250,7 @@ 
 		if ($this->iniWrapper->getString('open_basedir') !== '' && PHP_INT_SIZE === 4) {
 			$errors[] = [
 				'error' => $this->l10n->t(
-					'It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. ' .
+					'It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. '.
 					'This will lead to problems with files over 4 GB and is highly discouraged.',
 					[$this->defaults->getProductName()]
 				),
@@ -287,7 +287,7 @@ 
 			$error[] = $l->t('Set an admin password.');
 		}
 		if (empty($options['directory'])) {
-			$options['directory'] = \OC::$SERVERROOT . "/data";
+			$options['directory'] = \OC::$SERVERROOT."/data";
 		}
 
 		if (!isset(self::$dbSetupClasses[$dbType])) {
@@ -343,7 +343,7 @@ 
 		];
 
 		if ($this->config->getValue('overwrite.cli.url', null) === null) {
-			$newConfigValues['overwrite.cli.url'] = $request->getServerProtocol() . '://' . $request->getInsecureServerHost() . \OC::$WEBROOT;
+			$newConfigValues['overwrite.cli.url'] = $request->getServerProtocol().'://'.$request->getInsecureServerHost().\OC::$WEBROOT;
 		}
 
 		$this->config->setValues($newConfigValues);
@@ -360,7 +360,7 @@ 
 			return $error;
 		} catch (Exception $e) {
 			$error[] = [
-				'error' => 'Error while trying to create admin user: ' . $e->getMessage(),
+				'error' => 'Error while trying to create admin user: '.$e->getMessage(),
 				'exception' => $e,
 				'hint' => '',
 			];
@@ -371,7 +371,7 @@ 
 			$dbSetup->runMigrations();
 		} catch (Exception $e) {
 			$error[] = [
-				'error' => 'Error while trying to initialise the database: ' . $e->getMessage(),
+				'error' => 'Error while trying to initialise the database: '.$e->getMessage(),
 				'exception' => $e,
 				'hint' => '',
 			];
@@ -410,7 +410,7 @@ 
 
 			// create empty file in data dir, so we can later find
 			// out that this is indeed an ownCloud data directory
-			file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', '');
+			file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', '');
 
 			// Update .htaccess files
 			self::updateHtaccess();
@@ -456,7 +456,7 @@ 
 	 * @return string Absolute path to htaccess
 	 */
 	private function pathToHtaccess() {
-		return \OC::$SERVERROOT . '/.htaccess';
+		return \OC::$SERVERROOT.'/.htaccess';
 	}
 
 	/**
@@ -514,10 +514,10 @@ 
 		$htaccessContent = explode($content, $htaccessContent, 2)[0];
 
 		//custom 403 error page
-		$content .= "\nErrorDocument 403 " . $webRoot . '/index.php/error/403';
+		$content .= "\nErrorDocument 403 ".$webRoot.'/index.php/error/403';
 
 		//custom 404 error page
-		$content .= "\nErrorDocument 404 " . $webRoot . '/index.php/error/404';
+		$content .= "\nErrorDocument 404 ".$webRoot.'/index.php/error/404';
 
 		// Add rewrite rules if the RewriteBase is configured
 		$rewriteBase = $config->getValue('htaccess.RewriteBase', '');
@@ -536,7 +536,7 @@ 
 			$content .= "\n  RewriteCond %{REQUEST_URI} !^/\\.well-known/(acme-challenge|pki-validation)/.*";
 			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/richdocumentscode(_arm64)?/proxy.php$";
 			$content .= "\n  RewriteRule . index.php [PT,E=PATH_INFO:$1]";
-			$content .= "\n  RewriteBase " . $rewriteBase;
+			$content .= "\n  RewriteBase ".$rewriteBase;
 			$content .= "\n  <IfModule mod_env.c>";
 			$content .= "\n    SetEnv front_controller_active true";
 			$content .= "\n    <IfModule mod_dir.c>";
@@ -548,7 +548,7 @@ 
 
 		if ($content !== '') {
 			//suppress errors in case we don't have permissions for it
-			return (bool)@file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent . $content . "\n");
+			return (bool) @file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent.$content."\n");
 		}
 
 		return false;
@@ -582,19 +582,19 @@ 
 		$content .= "  IndexIgnore *\n";
 		$content .= "</IfModule>";
 
-		$baseDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
-		file_put_contents($baseDir . '/.htaccess', $content);
-		file_put_contents($baseDir . '/index.html', '');
+		$baseDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
+		file_put_contents($baseDir.'/.htaccess', $content);
+		file_put_contents($baseDir.'/index.html', '');
 	}
 
 	private function getVendorData(): array {
 		// this should really be a JSON file
-		require \OC::$SERVERROOT . '/version.php';
+		require \OC::$SERVERROOT.'/version.php';
 		/** @var mixed $vendor */
 		/** @var mixed $OC_Channel */
 		return [
-			'vendor' => (string)$vendor,
-			'channel' => (string)$OC_Channel,
+			'vendor' => (string) $vendor,
+			'channel' => (string) $OC_Channel,
 		];
 	}
 }