nextcloud / server

lib/private/Security/CertificateManager.php

Spacing +15 added lines, -15 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';
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 	 */
 	public function getAbsoluteBundlePath(): string {
 		if (!$this->hasCertificates()) {
-			return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
+			return \OC::$SERVERROOT.'/resources/config/ca-bundle.crt';
 		}
 
 		if ($this->needsRebundling()) {
@@ -279,6 +279,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');
 	}
 }