nextcloud / server

apps/dav/lib/Connector/Sabre/ObjectTree.php

Spacing +5 added lines, -5 removed lines

@@ -90,7 +90,7 @@ 
 			if (isset($info['transferid'])) {
 				// getNodePath is called for multiple nodes within a chunk
 				// upload call
-				$path = $dir . '/' . $info['name'];
+				$path = $dir.'/'.$info['name'];
 				$path = ltrim($path, '/');
 			}
 		}
@@ -161,7 +161,7 @@ 
 			} catch (StorageNotAvailableException $e) {
 				throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available');
 			} catch (StorageInvalidException $e) {
-				throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid');
+				throw new \Sabre\DAV\Exception\NotFound('Storage '.$path.' is invalid');
 			} catch (LockedException $e) {
 				throw new \Sabre\DAV\Exception\Locked();
 			} catch (ForbiddenException $e) {
@@ -170,7 +170,7 @@ 
 		}
 
 		if (!$info) {
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+			throw new \Sabre\DAV\Exception\NotFound('File with name '.$path.' could not be located');
 		}
 
 		if ($info->getType() === 'dir') {
@@ -214,7 +214,7 @@ 
 			} else {
 				$destinationPermission = $infoDestination && $infoDestination->isCreatable();
 			}
-			$sourcePermission =  $infoSource && $infoSource->isDeletable();
+			$sourcePermission = $infoSource && $infoSource->isDeletable();
 		}
 
 		if (!$destinationPermission || !$sourcePermission) {
@@ -224,7 +224,7 @@ 
 		$targetNodeExists = $this->nodeExists($destinationPath);
 		$sourceNode = $this->getNodeForPath($sourcePath);
 		if ($sourceNode instanceof \Sabre\DAV\ICollection && $targetNodeExists) {
-			throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory ' . $sourceNode->getName() . ', target exists');
+			throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory '.$sourceNode->getName().', target exists');
 		}
 		list($sourceDir,) = \Sabre\HTTP\URLUtil::splitPath($sourcePath);
 		list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destinationPath);

apps/dav/lib/Connector/Sabre/FilesReportPlugin.php

Spacing +9 added lines, -9 removed lines

@@ -172,14 +172,14 @@ 
 			return;
 		}
 
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
+		$ns = '{'.$this::NS_OWNCLOUD.'}';
 		$requestedProps = [];
 		$filterRules = [];
 
 		// parse report properties and gather filter info
 		foreach ($report as $reportProps) {
 			$name = $reportProps['name'];
-			if ($name === $ns . 'filter-rules') {
+			if ($name === $ns.'filter-rules') {
 				$filterRules = $reportProps['value'];
 			} else if ($name === '{DAV:}prop') {
 				// propfind properties
@@ -240,7 +240,7 @@ 
 		if (empty($filesUri)) {
 			return '';
 		}
-		return '/' . $filesUri;
+		return '/'.$filesUri;
 	}
 
 	/**
@@ -252,15 +252,15 @@ 
 	 * @throws TagNotFoundException whenever a tag was not found
 	 */
 	protected function processFilterRules($filterRules) {
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
+		$ns = '{'.$this::NS_OWNCLOUD.'}';
 		$resultFileIds = null;
 		$systemTagIds = [];
 		$favoriteFilter = null;
 		foreach ($filterRules as $filterRule) {
-			if ($filterRule['name'] === $ns . 'systemtag') {
+			if ($filterRule['name'] === $ns.'systemtag') {
 				$systemTagIds[] = $filterRule['value'];
 			}
-			if ($filterRule['name'] === $ns . 'favorite') {
+			if ($filterRule['name'] === $ns.'favorite') {
 				$favoriteFilter = true;
 			}
 		}
@@ -299,7 +299,7 @@ 
 			}
 
 			if (!empty($unknownTagIds)) {
-				throw new TagNotFoundException('Tag with ids ' . implode(', ', $unknownTagIds) . ' not found');
+				throw new TagNotFoundException('Tag with ids '.implode(', ', $unknownTagIds).' not found');
 			}
 		}
 
@@ -339,7 +339,7 @@ 
 	public function prepareResponses($filesUri, $requestedProps, $nodes) {
 		$responses = [];
 		foreach ($nodes as $node) {
-			$propFind = new PropFind($filesUri . $node->getPath(), $requestedProps);
+			$propFind = new PropFind($filesUri.$node->getPath(), $requestedProps);
 
 			$this->server->getPropertiesByNode($propFind, $node);
 			// copied from Sabre Server's getPropertiesForPath
@@ -352,7 +352,7 @@ 
 			}
 
 			$responses[] = new Response(
-				rtrim($this->server->getBaseUri(), '/') . $filesUri . $node->getPath(),
+				rtrim($this->server->getBaseUri(), '/').$filesUri.$node->getPath(),
 				$result,
 				200
 			);

apps/dav/lib/Connector/Sabre/ChecksumList.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 	function xmlSerialize(Writer $writer) {
 
 		foreach ($this->checksums as $checksum) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}checksum', $checksum);
 		}
 	}
 }

apps/dav/lib/Connector/Sabre/Directory.php

Spacing +7 added lines, -7 removed lines

@@ -115,7 +115,7 @@ 
 				// exit if we can't create a new file and we don't updatable existing file
 				$info = \OC_FileChunking::decodeName($name);
 				if (!$this->fileView->isCreatable($this->path) &&
-					!$this->fileView->isUpdatable($this->path . '/' . $info['name'])
+					!$this->fileView->isUpdatable($this->path.'/'.$info['name'])
 				) {
 					throw new \Sabre\DAV\Exception\Forbidden();
 				}
@@ -129,7 +129,7 @@ 
 
 			$this->fileView->verifyPath($this->path, $name);
 
-			$path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
+			$path = $this->fileView->getAbsolutePath($this->path).'/'.$name;
 			// using a dummy FileInfo is acceptable here since it will be refreshed after the put is complete
 			$info = new \OC\Files\FileInfo($path, null, null, array(), null);
 			$node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
@@ -162,9 +162,9 @@ 
 			}
 
 			$this->fileView->verifyPath($this->path, $name);
-			$newPath = $this->path . '/' . $name;
+			$newPath = $this->path.'/'.$name;
 			if (!$this->fileView->mkdir($newPath)) {
-				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath);
+				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory '.$newPath);
 			}
 		} catch (\OCP\Files\StorageNotAvailableException $e) {
 			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
@@ -188,7 +188,7 @@ 
 	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
 	 */
 	public function getChild($name, $info = null) {
-		$path = $this->path . '/' . $name;
+		$path = $this->path.'/'.$name;
 		if (is_null($info)) {
 			try {
 				$this->fileView->verifyPath($this->path, $name);
@@ -203,7 +203,7 @@ 
 		}
 
 		if (!$info) {
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+			throw new \Sabre\DAV\Exception\NotFound('File with name '.$path.' could not be located');
 		}
 
 		if ($info['mimetype'] == 'httpd/unix-directory') {
@@ -255,7 +255,7 @@ 
 		// (required old code) instead of "updateFile".
 		//
 		// TODO: resolve chunk file name here and implement "updateFile"
-		$path = $this->path . '/' . $name;
+		$path = $this->path.'/'.$name;
 		return $this->fileView->file_exists($path);
 
 	}

apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 	 */
 	public function beforeHandler(RequestInterface $request) {
 		$userAgent = $request->getHeader('User-Agent');
-		if($userAgent === null) {
+		if ($userAgent === null) {
 			return;
 		}
 
@@ -73,7 +73,7 @@ 
 		// Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or
 		// "mirall/%1" for older releases
 		preg_match("/(?:mirall\\/)([\d.]+)/i", $userAgent, $versionMatches);
-		if(isset($versionMatches[1]) &&
+		if (isset($versionMatches[1]) &&
 			version_compare($versionMatches[1], $minimumSupportedDesktopVersion) === -1) {
 			throw new \Sabre\DAV\Exception\Forbidden('Unsupported client version.');
 		}

apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php

Spacing +4 added lines, -4 removed lines

@@ -99,13 +99,13 @@ 
 	 * @return mixed|string
 	 */
 	public function getCommentsLink(Node $node) {
-		$href =  $this->server->getBaseUri();
+		$href = $this->server->getBaseUri();
 		$entryPoint = strpos($href, '/remote.php/');
-		if($entryPoint === false) {
+		if ($entryPoint === false) {
 			// in case we end up somewhere else, unexpectedly.
 			return null;
 		}
-		$commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
+		$commentsPart = 'dav/comments/files/'.rawurldecode($node->getId());
 		$href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
 		return $href;
 	}
@@ -119,7 +119,7 @@ 
 	 */
 	public function getUnreadCount(Node $node) {
 		$user = $this->userSession->getUser();
-		if(is_null($user)) {
+		if (is_null($user)) {
 			return null;
 		}
 

apps/dav/lib/Connector/Sabre/ShareTypeList.php

Spacing +3 added lines, -3 removed lines

@@ -71,8 +71,8 @@ 
 			return null;
 		}
 		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
-				$shareTypes[] = (int)$elem['value'];
+			if ($elem['name'] === '{'.self::NS_OWNCLOUD.'}share-type') {
+				$shareTypes[] = (int) $elem['value'];
 			}
 		}
 		return new self($shareTypes);
@@ -86,7 +86,7 @@ 
 	 */
 	function xmlSerialize(Writer $writer) {
 		foreach ($this->shareTypes as $shareType) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}share-type', $shareType);
 		}
 	}
 }

apps/dav/lib/Connector/Sabre/File.php

Spacing +14 added lines, -14 removed lines

@@ -92,7 +92,7 @@ 
 				throw new Forbidden();
 			}
 		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable("File is not updatable: " . $e->getMessage());
+			throw new ServiceUnavailable("File is not updatable: ".$e->getMessage());
 		}
 
 		// verify path of the target
@@ -112,7 +112,7 @@ 
 
 		if ($needsPartFile) {
 			// mark file as partial while uploading (ignored by the scanner)
-			$partFilePath = $this->getPartFileBasePath($this->path) . '.ocTransferId' . rand() . '.part';
+			$partFilePath = $this->getPartFileBasePath($this->path).'.ocTransferId'.rand().'.part';
 		} else {
 			// upload file directly as the final path
 			$partFilePath = $this->path;
@@ -138,7 +138,7 @@ 
 				if (isset($_SERVER['CONTENT_LENGTH'])) {
 					$expected = $_SERVER['CONTENT_LENGTH'];
 				}
-				throw new Exception('Error while copying file to target location (copied bytes: ' . $count . ', expected filesize: ' . $expected . ' )');
+				throw new Exception('Error while copying file to target location (copied bytes: '.$count.', expected filesize: '.$expected.' )');
 			}
 
 			// if content length is sent by client:
@@ -147,7 +147,7 @@ 
 			if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
 				$expected = $_SERVER['CONTENT_LENGTH'];
 				if ($count != $expected) {
-					throw new BadRequest('expected filesize ' . $expected . ' got ' . $count);
+					throw new BadRequest('expected filesize '.$expected.' got '.$count);
 				}
 			}
 
@@ -227,10 +227,10 @@ 
 			}
 
 		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable("Failed to check file size: " . $e->getMessage());
+			throw new ServiceUnavailable("Failed to check file size: ".$e->getMessage());
 		}
 
-		return '"' . $this->info->getEtag() . '"';
+		return '"'.$this->info->getEtag().'"';
 	}
 
 	private function getPartFileBasePath($path) {
@@ -309,9 +309,9 @@ 
 			return $res;
 		} catch (GenericEncryptionException $e) {
 			// returning 503 will allow retry of the operation at a later point in time
-			throw new ServiceUnavailable("Encryption not ready: " . $e->getMessage());
+			throw new ServiceUnavailable("Encryption not ready: ".$e->getMessage());
 		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable("Failed to open file: " . $e->getMessage());
+			throw new ServiceUnavailable("Failed to open file: ".$e->getMessage());
 		} catch (ForbiddenException $ex) {
 			throw new DAVForbiddenException($ex->getMessage(), $ex->getRetry());
 		} catch (LockedException $e) {
@@ -336,7 +336,7 @@ 
 				throw new Forbidden();
 			}
 		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable("Failed to unlink: " . $e->getMessage());
+			throw new ServiceUnavailable("Failed to unlink: ".$e->getMessage());
 		} catch (ForbiddenException $ex) {
 			throw new DAVForbiddenException($ex->getMessage(), $ex->getRetry());
 		} catch (LockedException $e) {
@@ -403,7 +403,7 @@ 
 				if ($bytesWritten != $expected) {
 					$chunk_handler->remove($info['index']);
 					throw new BadRequest(
-						'expected filesize ' . $expected . ' got ' . $bytesWritten);
+						'expected filesize '.$expected.' got '.$bytesWritten);
 				}
 			}
 		}
@@ -413,7 +413,7 @@ 
 			$needsPartFile = $this->needsPartFile($storage);
 			$partFile = null;
 
-			$targetPath = $path . '/' . $info['name'];
+			$targetPath = $path.'/'.$info['name'];
 			/** @var \OC\Files\Storage\Storage $targetStorage */
 			list($targetStorage, $targetInternalPath) = $this->fileView->resolvePath($targetPath);
 
@@ -429,7 +429,7 @@ 
 
 				if ($needsPartFile) {
 					// we first assembly the target file as a part file
-					$partFile = $this->getPartFileBasePath($path . '/' . $info['name']) . '.ocTransferId' . $info['transferid'] . '.part';
+					$partFile = $this->getPartFileBasePath($path.'/'.$info['name']).'.ocTransferId'.$info['transferid'].'.part';
 					/** @var \OC\Files\Storage\Storage $targetStorage */
 					list($partStorage, $partInternalPath) = $this->fileView->resolvePath($partFile);
 
@@ -548,10 +548,10 @@ 
 		}
 		if ($e instanceof GenericEncryptionException) {
 			// returning 503 will allow retry of the operation at a later point in time
-			throw new ServiceUnavailable('Encryption not ready: ' . $e->getMessage(), 0, $e);
+			throw new ServiceUnavailable('Encryption not ready: '.$e->getMessage(), 0, $e);
 		}
 		if ($e instanceof StorageNotAvailableException) {
-			throw new ServiceUnavailable('Failed to write file contents: ' . $e->getMessage(), 0, $e);
+			throw new ServiceUnavailable('Failed to write file contents: '.$e->getMessage(), 0, $e);
 		}
 
 		throw new \Sabre\DAV\Exception($e->getMessage(), 0, $e);

apps/dav/lib/Connector/Sabre/Exception/Forbidden.php

Spacing +3 added lines, -3 removed lines

@@ -49,17 +49,17 @@
 	 * @param \DOMElement $errorNode
 	 * @return void
 	 */
-	public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) {
+	public function serialize(\Sabre\DAV\Server $server, \DOMElement $errorNode) {
 
 		// set ownCloud namespace
 		$errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
 
 		// adding the retry node
-		$error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true));
+		$error = $errorNode->ownerDocument->createElementNS('o:', 'o:retry', var_export($this->retry, true));
 		$errorNode->appendChild($error);
 
 		// adding the message node
-		$error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage());
+		$error = $errorNode->ownerDocument->createElementNS('o:', 'o:reason', $this->getMessage());
 		$errorNode->appendChild($error);
 	}
 }