nextcloud / server

lib/private/Files/Stream/Encryption.php

Spacing +15 added lines, -15 removed lines

@@ -209,9 +209,9 @@ 
 			stream_wrapper_register($protocol, $class);
 			$context = self::buildContext($protocol, $context, $source);
 			if (self::isDirectoryHandle($source)) {
-				$wrapped = opendir($protocol . '://', $context);
+				$wrapped = opendir($protocol.'://', $context);
 			} else {
-				$wrapped = fopen($protocol . '://', $mode, false, $context);
+				$wrapped = fopen($protocol.'://', $mode, false, $context);
 			}
 		} catch (\BadMethodCallException $e) {
 			stream_wrapper_unregister($protocol);
@@ -247,7 +247,7 @@ 
 			if (array_key_exists($property, $context)) {
 				$this->{$property} = $context[$property];
 			} else {
-				throw new \BadMethodCallException('Invalid context, "' . $property . '" options not set');
+				throw new \BadMethodCallException('Invalid context, "'.$property.'" options not set');
 			}
 		}
 		return $context;
@@ -370,7 +370,7 @@ 
 
 			// for seekable streams the pointer is moved back to the beginning of the encrypted block
 			// flush will start writing there when the position moves to another block
-			$positionInFile = (int)floor($this->position / $this->unencryptedBlockSize) *
+			$positionInFile = (int) floor($this->position / $this->unencryptedBlockSize) *
 				$this->util->getBlockSize() + $this->headerSize;
 			$resultFseek = $this->parentStreamSeek($positionInFile);
 
@@ -388,14 +388,14 @@ 
 				// update position and liberate $data
 				if ($remainingLength < ($this->unencryptedBlockSize - $blockPosition)) {
 					$this->cache = substr($this->cache, 0, $blockPosition)
-						. $data . substr($this->cache, $blockPosition + $remainingLength);
+						. $data.substr($this->cache, $blockPosition + $remainingLength);
 					$this->position += $remainingLength;
 					$length += $remainingLength;
 					$data = '';
 				// if $data doesn't fit the current block, the fill the current block and reiterate
 					// after the block is filled, it is flushed and $data is updatedxxx
 				} else {
-					$this->cache = substr($this->cache, 0, $blockPosition) .
+					$this->cache = substr($this->cache, 0, $blockPosition).
 						substr($data, 0, $this->unencryptedBlockSize - $blockPosition);
 					$this->flush();
 					$this->position += ($this->unencryptedBlockSize - $blockPosition);
@@ -435,7 +435,7 @@ 
 			return $return;
 		}
 
-		$newFilePosition = (int)floor($newPosition / $this->unencryptedBlockSize)
+		$newFilePosition = (int) floor($newPosition / $this->unencryptedBlockSize)
 			* $this->util->getBlockSize() + $this->headerSize;
 
 		$oldFilePosition = parent::stream_tell();
@@ -451,8 +451,8 @@ 
 
 	public function stream_close() {
 		$this->flush('end');
-		$position = (int)floor($this->position / $this->unencryptedBlockSize);
-		$remainingData = $this->encryptionModule->end($this->fullPath, $position . 'end');
+		$position = (int) floor($this->position / $this->unencryptedBlockSize);
+		$remainingData = $this->encryptionModule->end($this->fullPath, $position.'end');
 		if ($this->readOnly === false) {
 			if (!empty($remainingData)) {
 				parent::stream_write($remainingData);
@@ -484,16 +484,16 @@ 
 			// automatically attempted when the file is written to disk -
 			// we are handling that separately here and we don't want to
 			// get into an infinite loop
-			$position = (int)floor($this->position / $this->unencryptedBlockSize);
-			$encrypted = $this->encryptionModule->encrypt($this->cache, $position . $positionPrefix);
+			$position = (int) floor($this->position / $this->unencryptedBlockSize);
+			$encrypted = $this->encryptionModule->encrypt($this->cache, $position.$positionPrefix);
 			$bytesWritten = parent::stream_write($encrypted);
 			$this->writeFlag = false;
 			// Check whether the write concerns the last block
 			// If so then update the encrypted filesize
 			// Note that the unencrypted pointer and filesize are NOT yet updated when flush() is called
 			// We recalculate the encrypted filesize as we do not know the context of calling flush()
-			$completeBlocksInFile = (int)floor($this->unencryptedSize / $this->unencryptedBlockSize);
-			if ($completeBlocksInFile === (int)floor($this->position / $this->unencryptedBlockSize)) {
+			$completeBlocksInFile = (int) floor($this->unencryptedSize / $this->unencryptedBlockSize);
+			if ($completeBlocksInFile === (int) floor($this->position / $this->unencryptedBlockSize)) {
 				$this->size = $this->util->getBlockSize() * $completeBlocksInFile;
 				$this->size += $bytesWritten;
 				$this->size += $this->headerSize;
@@ -512,8 +512,8 @@ 
 		if ($this->cache === '' && !($this->position === $this->unencryptedSize && ($this->position % $this->unencryptedBlockSize) === 0)) {
 			// Get the data from the file handle
 			$data = $this->stream_read_block($this->util->getBlockSize());
-			$position = (int)floor($this->position / $this->unencryptedBlockSize);
-			$numberOfChunks = (int)($this->unencryptedSize / $this->unencryptedBlockSize);
+			$position = (int) floor($this->position / $this->unencryptedBlockSize);
+			$numberOfChunks = (int) ($this->unencryptedSize / $this->unencryptedBlockSize);
 			if ($numberOfChunks === $position) {
 				$position .= 'end';
 			}

lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php

Spacing +4 added lines, -4 removed lines

@@ -69,13 +69,13 @@ 
 		}
 
 		$counter = 0;
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($counter) {
+		$this->userManager->callForSeenUsers(function(IUser $user) use ($counter) {
 			$uid = $user->getUID();
 
-			$path = 'avatars/' . $this->buildOwnCloudAvatarPath($uid);
+			$path = 'avatars/'.$this->buildOwnCloudAvatarPath($uid);
 			$avatar = $this->avatarManager->getAvatar($uid);
 			try {
-				$avatarPath = $path . '/avatar.' . $this->getExtension($path);
+				$avatarPath = $path.'/avatar.'.$this->getExtension($path);
 				$resource = $this->owncloudAvatarStorage->fopen($avatarPath, 'r');
 				if (is_resource($resource)) {
 					$avatar->set($resource);
@@ -86,7 +86,7 @@ 
 			} catch (NotFoundException $e) {
 				// In case there is no avatar we can just skip
 			} catch (\Throwable $e) {
-				$this->logger->error('Failed to migrate avatar for user ' . $uid, ['exception' => $e]);
+				$this->logger->error('Failed to migrate avatar for user '.$uid, ['exception' => $e]);
 			}
 
 			$counter++;