nextcloud / server

lib/private/Security/CertificateManager.php

Spacing +16 added lines, -16 removed lines

@@ -87,7 +87,7 @@ 
 			return [];
 		}
 
-		$path = $this->getPathToCertificates() . 'uploads/';
+		$path = $this->getPathToCertificates().'uploads/';
 		if (!$this->view->is_dir($path)) {
 			return [];
 		}
@@ -99,7 +99,7 @@ 
 		while (false !== ($file = readdir($handle))) {
 			if ($file != '.' && $file != '..') {
 				try {
-					$result[] = new Certificate($this->view->file_get_contents($path . $file), $file);
+					$result[] = new Certificate($this->view->file_get_contents($path.$file), $file);
 				} catch (\Exception $e) {
 				}
 			}
@@ -113,7 +113,7 @@ 
 			return false;
 		}
 
-		$path = $this->getPathToCertificates() . 'uploads/';
+		$path = $this->getPathToCertificates().'uploads/';
 		if (!$this->view->is_dir($path)) {
 			return false;
 		}
@@ -142,20 +142,20 @@ 
 			$this->view->mkdir($path);
 		}
 
-		$defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+		$defaultCertificates = file_get_contents(\OC::$SERVERROOT.'/resources/config/ca-bundle.crt');
 		if (strlen($defaultCertificates) < 1024) { // sanity check to verify that we have some content for our bundle
 			// log as exception so we have a stacktrace
 			$this->logger->logException(new \Exception('Shipped ca-bundle is empty, refusing to create certificate bundle'));
 			return;
 		}
 
-		$certPath = $path . 'rootcerts.crt';
-		$tmpPath = $certPath . '.tmp' . $this->random->generate(10, ISecureRandom::CHAR_DIGITS);
+		$certPath = $path.'rootcerts.crt';
+		$tmpPath = $certPath.'.tmp'.$this->random->generate(10, ISecureRandom::CHAR_DIGITS);
 		$fhCerts = $this->view->fopen($tmpPath, 'w');
 
 		// Write user certificates
 		foreach ($certs as $cert) {
-			$file = $path . '/uploads/' . $cert->getName();
+			$file = $path.'/uploads/'.$cert->getName();
 			$data = $this->view->file_get_contents($file);
 			if (strpos($data, 'BEGIN CERTIFICATE')) {
 				fwrite($fhCerts, $data);
@@ -191,13 +191,13 @@ 
 			throw new \Exception('Filename is not valid');
 		}
 
-		$dir = $this->getPathToCertificates() . 'uploads/';
+		$dir = $this->getPathToCertificates().'uploads/';
 		if (!$this->view->file_exists($dir)) {
 			$this->view->mkdir($dir);
 		}
 
 		try {
-			$file = $dir . $name;
+			$file = $dir.$name;
 			$certificateObject = new Certificate($certificate, $name);
 			$this->view->file_put_contents($file, $certificate);
 			$this->createCertificateBundle();
@@ -217,9 +217,9 @@ 
 		if (!Filesystem::isValidPath($name)) {
 			return false;
 		}
-		$path = $this->getPathToCertificates() . 'uploads/';
-		if ($this->view->file_exists($path . $name)) {
-			$this->view->unlink($path . $name);
+		$path = $this->getPathToCertificates().'uploads/';
+		if ($this->view->file_exists($path.$name)) {
+			$this->view->unlink($path.$name);
 			$this->createCertificateBundle();
 		}
 		return true;
@@ -231,7 +231,7 @@ 
 	 * @return string
 	 */
 	public function getCertificateBundle(): string {
-		return $this->getPathToCertificates() . 'rootcerts.crt';
+		return $this->getPathToCertificates().'rootcerts.crt';
 	}
 
 	/**
@@ -242,7 +242,7 @@ 
 	public function getAbsoluteBundlePath(): string {
 		try {
 			if (!$this->hasCertificates()) {
-				return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
+				return \OC::$SERVERROOT.'/resources/config/ca-bundle.crt';
 			}
 
 			if ($this->needsRebundling()) {
@@ -251,7 +251,7 @@ 
 
 			return $this->view->getLocalFile($this->getCertificateBundle());
 		} catch (\Exception $e) {
-			return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
+			return \OC::$SERVERROOT.'/resources/config/ca-bundle.crt';
 		}
 	}
 
@@ -283,6 +283,6 @@ 
 	 * @return int
 	 */
 	protected function getFilemtimeOfCaBundle(): int {
-		return filemtime(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+		return filemtime(\OC::$SERVERROOT.'/resources/config/ca-bundle.crt');
 	}
 }

lib/private/Files/ObjectStore/S3ConnectionTrait.php

Spacing +9 added lines, -9 removed lines

@@ -73,7 +73,7 @@ 
 			throw new \Exception("Bucket has to be configured.");
 		}
 
-		$this->id = 'amazon::' . $params['bucket'];
+		$this->id = 'amazon::'.$params['bucket'];
 
 		$this->test = isset($params['test']);
 		$this->bucket = $params['bucket'];
@@ -82,7 +82,7 @@ 
 		$this->uploadPartSize = $params['uploadPartSize'] ?? 524288000;
 		$this->putSizeLimit = $params['putSizeLimit'] ?? 104857600;
 		$params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
-		$params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname'];
+		$params['hostname'] = empty($params['hostname']) ? 's3.'.$params['region'].'.amazonaws.com' : $params['hostname'];
 		if (!isset($params['port']) || $params['port'] === '') {
 			$params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443;
 		}
@@ -110,7 +110,7 @@ 
 		}
 
 		$scheme = (isset($this->params['use_ssl']) && $this->params['use_ssl'] === false) ? 'http' : 'https';
-		$base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
+		$base_url = $scheme.'://'.$this->params['hostname'].':'.$this->params['port'].'/';
 
 		// Adding explicit credential provider to the beginning chain.
 		// Including default credential provider (skipping AWS shared config files).
@@ -127,7 +127,7 @@ 
 			$certManager = \OC::$server->get(ICertificateManager::class);
 			$certPath = $certManager->getAbsoluteBundlePath();
 		} else {
-			$certPath = \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
+			$certPath = \OC::$SERVERROOT.'/resources/config/ca-bundle.crt';
 		}
 
 		$options = [
@@ -151,16 +151,16 @@ 
 
 		if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
 			$logger = \OC::$server->getLogger();
-			$logger->debug('Bucket "' . $this->bucket . '" This bucket name is not dns compatible, it may contain invalid characters.',
+			$logger->debug('Bucket "'.$this->bucket.'" This bucket name is not dns compatible, it may contain invalid characters.',
 					 ['app' => 'objectstore']);
 		}
 
 		if ($this->params['verify_bucket_exists'] && !$this->connection->doesBucketExist($this->bucket)) {
 			$logger = \OC::$server->getLogger();
 			try {
-				$logger->info('Bucket "' . $this->bucket . '" does not exist - creating it.', ['app' => 'objectstore']);
+				$logger->info('Bucket "'.$this->bucket.'" does not exist - creating it.', ['app' => 'objectstore']);
 				if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
-					throw new \Exception("The bucket will not be created because the name is not dns compatible, please correct it: " . $this->bucket);
+					throw new \Exception("The bucket will not be created because the name is not dns compatible, please correct it: ".$this->bucket);
 				}
 				$this->connection->createBucket(['Bucket' => $this->bucket]);
 				$this->testTimeout();
@@ -170,7 +170,7 @@ 
 					'level' => ILogger::DEBUG,
 					'app' => 'objectstore',
 				]);
-				throw new \Exception('Creation of bucket "' . $this->bucket . '" failed. ' . $e->getMessage());
+				throw new \Exception('Creation of bucket "'.$this->bucket.'" failed. '.$e->getMessage());
 			}
 		}
 
@@ -205,7 +205,7 @@ 
 	 * This function creates a credential provider based on user parameter file
 	 */
 	protected function paramCredentialProvider() : callable {
-		return function () {
+		return function() {
 			$key = empty($this->params['key']) ? null : $this->params['key'];
 			$secret = empty($this->params['secret']) ? null : $this->params['secret'];