nextcloud / server

core/templates/error.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 			<p><?php p($error['error']) ?></p>
 			<?php if (isset($error['hint']) && $error['hint']): ?>
 				<p class='hint'><?php p($error['hint']) ?></p>
-			<?php endif;?>
+			<?php endif; ?>
 		</li>
 	<?php endforeach ?>
 	</ul>

core/Command/Encryption/ChangeKeyStorageRoot.php

Spacing +8 added lines, -8 removed lines

@@ -142,7 +142,7 @@ 
 		}
 
 		$result = $this->rootView->file_put_contents(
-			$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
+			$newRoot.'/'.Storage::KEY_STORAGE_MARKER,
 			'Nextcloud will detect this folder as key storage root only if this file exists'
 		);
 
@@ -160,10 +160,10 @@ 
 	 */
 	protected function moveSystemKeys($oldRoot, $newRoot) {
 		if (
-			$this->rootView->is_dir($oldRoot . '/files_encryption') &&
-			$this->targetExists($newRoot . '/files_encryption') === false
+			$this->rootView->is_dir($oldRoot.'/files_encryption') &&
+			$this->targetExists($newRoot.'/files_encryption') === false
 		) {
-			$this->rootView->rename($oldRoot . '/files_encryption', $newRoot . '/files_encryption');
+			$this->rootView->rename($oldRoot.'/files_encryption', $newRoot.'/files_encryption');
 		}
 	}
 
@@ -217,13 +217,13 @@ 
 	 */
 	protected function moveUserEncryptionFolder($user, $oldRoot, $newRoot) {
 		if ($this->userManager->userExists($user)) {
-			$source = $oldRoot . '/' . $user . '/files_encryption';
-			$target = $newRoot . '/' . $user . '/files_encryption';
+			$source = $oldRoot.'/'.$user.'/files_encryption';
+			$target = $newRoot.'/'.$user.'/files_encryption';
 			if (
 				$this->rootView->is_dir($source) &&
 				$this->targetExists($target) === false
 			) {
-				$this->prepareParentFolder($newRoot . '/' . $user);
+				$this->prepareParentFolder($newRoot.'/'.$user);
 				$this->rootView->rename($source, $target);
 			}
 		}
@@ -241,7 +241,7 @@ 
 			$sub_dirs = explode('/', ltrim($path, '/'));
 			$dir = '';
 			foreach ($sub_dirs as $sub_dir) {
-				$dir .= '/' . $sub_dir;
+				$dir .= '/'.$sub_dir;
 				if ($this->rootView->file_exists($dir) === false) {
 					$this->rootView->mkdir($dir);
 				}

Indentation +204 added lines, -204 removed lines

@@ -22,208 +22,208 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class ChangeKeyStorageRoot extends Command {
-	public function __construct(
-		protected View $rootView,
-		protected IUserManager $userManager,
-		protected IConfig $config,
-		protected Util $util,
-		protected QuestionHelper $questionHelper,
-	) {
-		parent::__construct();
-	}
-
-	protected function configure() {
-		parent::configure();
-		$this
-			->setName('encryption:change-key-storage-root')
-			->setDescription('Change key storage root')
-			->addArgument(
-				'newRoot',
-				InputArgument::OPTIONAL,
-				'new root of the key storage relative to the data folder'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$oldRoot = $this->util->getKeyStorageRoot();
-		$newRoot = $input->getArgument('newRoot');
-
-		if ($newRoot === null) {
-			$question = new ConfirmationQuestion('No storage root given, do you want to reset the key storage root to the default location? (y/n) ', false);
-			if (!$this->questionHelper->ask($input, $output, $question)) {
-				return 1;
-			}
-			$newRoot = '';
-		}
-
-		$oldRootDescription = $oldRoot !== '' ? $oldRoot : 'default storage location';
-		$newRootDescription = $newRoot !== '' ? $newRoot : 'default storage location';
-		$output->writeln("Change key storage root from <info>$oldRootDescription</info> to <info>$newRootDescription</info>");
-		$success = $this->moveAllKeys($oldRoot, $newRoot, $output);
-		if ($success) {
-			$this->util->setKeyStorageRoot($newRoot);
-			$output->writeln('');
-			$output->writeln("Key storage root successfully changed to <info>$newRootDescription</info>");
-			return 0;
-		}
-		return 1;
-	}
-
-	/**
-	 * move keys to new key storage root
-	 *
-	 * @param string $oldRoot
-	 * @param string $newRoot
-	 * @param OutputInterface $output
-	 * @return bool
-	 * @throws \Exception
-	 */
-	protected function moveAllKeys($oldRoot, $newRoot, OutputInterface $output) {
-		$output->writeln('Start to move keys:');
-
-		if ($this->rootView->is_dir($oldRoot) === false) {
-			$output->writeln('No old keys found: Nothing needs to be moved');
-			return false;
-		}
-
-		$this->prepareNewRoot($newRoot);
-		$this->moveSystemKeys($oldRoot, $newRoot);
-		$this->moveUserKeys($oldRoot, $newRoot, $output);
-
-		return true;
-	}
-
-	/**
-	 * prepare new key storage
-	 *
-	 * @param string $newRoot
-	 * @throws \Exception
-	 */
-	protected function prepareNewRoot($newRoot) {
-		if ($this->rootView->is_dir($newRoot) === false) {
-			throw new \Exception("New root folder doesn't exist. Please create the folder or check the permissions and try again.");
-		}
-
-		$result = $this->rootView->file_put_contents(
-			$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
-			'Nextcloud will detect this folder as key storage root only if this file exists'
-		);
-
-		if (!$result) {
-			throw new \Exception("Can't access the new root folder. Please check the permissions and make sure that the folder is in your data folder");
-		}
-	}
-
-
-	/**
-	 * move system key folder
-	 *
-	 * @param string $oldRoot
-	 * @param string $newRoot
-	 */
-	protected function moveSystemKeys($oldRoot, $newRoot) {
-		if (
-			$this->rootView->is_dir($oldRoot . '/files_encryption') &&
-			$this->targetExists($newRoot . '/files_encryption') === false
-		) {
-			$this->rootView->rename($oldRoot . '/files_encryption', $newRoot . '/files_encryption');
-		}
-	}
-
-
-	/**
-	 * setup file system for the given user
-	 *
-	 * @param string $uid
-	 */
-	protected function setupUserFS($uid) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($uid);
-	}
-
-
-	/**
-	 * iterate over each user and move the keys to the new storage
-	 *
-	 * @param string $oldRoot
-	 * @param string $newRoot
-	 * @param OutputInterface $output
-	 */
-	protected function moveUserKeys($oldRoot, $newRoot, OutputInterface $output) {
-		$progress = new ProgressBar($output);
-		$progress->start();
-
-
-		foreach ($this->userManager->getBackends() as $backend) {
-			$limit = 500;
-			$offset = 0;
-			do {
-				$users = $backend->getUsers('', $limit, $offset);
-				foreach ($users as $user) {
-					$progress->advance();
-					$this->setupUserFS($user);
-					$this->moveUserEncryptionFolder($user, $oldRoot, $newRoot);
-				}
-				$offset += $limit;
-			} while (count($users) >= $limit);
-		}
-		$progress->finish();
-	}
-
-	/**
-	 * move user encryption folder to new root folder
-	 *
-	 * @param string $user
-	 * @param string $oldRoot
-	 * @param string $newRoot
-	 * @throws \Exception
-	 */
-	protected function moveUserEncryptionFolder($user, $oldRoot, $newRoot) {
-		if ($this->userManager->userExists($user)) {
-			$source = $oldRoot . '/' . $user . '/files_encryption';
-			$target = $newRoot . '/' . $user . '/files_encryption';
-			if (
-				$this->rootView->is_dir($source) &&
-				$this->targetExists($target) === false
-			) {
-				$this->prepareParentFolder($newRoot . '/' . $user);
-				$this->rootView->rename($source, $target);
-			}
-		}
-	}
-
-	/**
-	 * Make preparations to filesystem for saving a key file
-	 *
-	 * @param string $path relative to data/
-	 */
-	protected function prepareParentFolder($path) {
-		$path = Filesystem::normalizePath($path);
-		// If the file resides within a subdirectory, create it
-		if ($this->rootView->file_exists($path) === false) {
-			$sub_dirs = explode('/', ltrim($path, '/'));
-			$dir = '';
-			foreach ($sub_dirs as $sub_dir) {
-				$dir .= '/' . $sub_dir;
-				if ($this->rootView->file_exists($dir) === false) {
-					$this->rootView->mkdir($dir);
-				}
-			}
-		}
-	}
-
-	/**
-	 * check if target already exists
-	 *
-	 * @param $path
-	 * @return bool
-	 * @throws \Exception
-	 */
-	protected function targetExists($path) {
-		if ($this->rootView->file_exists($path)) {
-			throw new \Exception("new folder '$path' already exists");
-		}
-
-		return false;
-	}
+    public function __construct(
+        protected View $rootView,
+        protected IUserManager $userManager,
+        protected IConfig $config,
+        protected Util $util,
+        protected QuestionHelper $questionHelper,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure() {
+        parent::configure();
+        $this
+            ->setName('encryption:change-key-storage-root')
+            ->setDescription('Change key storage root')
+            ->addArgument(
+                'newRoot',
+                InputArgument::OPTIONAL,
+                'new root of the key storage relative to the data folder'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $oldRoot = $this->util->getKeyStorageRoot();
+        $newRoot = $input->getArgument('newRoot');
+
+        if ($newRoot === null) {
+            $question = new ConfirmationQuestion('No storage root given, do you want to reset the key storage root to the default location? (y/n) ', false);
+            if (!$this->questionHelper->ask($input, $output, $question)) {
+                return 1;
+            }
+            $newRoot = '';
+        }
+
+        $oldRootDescription = $oldRoot !== '' ? $oldRoot : 'default storage location';
+        $newRootDescription = $newRoot !== '' ? $newRoot : 'default storage location';
+        $output->writeln("Change key storage root from <info>$oldRootDescription</info> to <info>$newRootDescription</info>");
+        $success = $this->moveAllKeys($oldRoot, $newRoot, $output);
+        if ($success) {
+            $this->util->setKeyStorageRoot($newRoot);
+            $output->writeln('');
+            $output->writeln("Key storage root successfully changed to <info>$newRootDescription</info>");
+            return 0;
+        }
+        return 1;
+    }
+
+    /**
+     * move keys to new key storage root
+     *
+     * @param string $oldRoot
+     * @param string $newRoot
+     * @param OutputInterface $output
+     * @return bool
+     * @throws \Exception
+     */
+    protected function moveAllKeys($oldRoot, $newRoot, OutputInterface $output) {
+        $output->writeln('Start to move keys:');
+
+        if ($this->rootView->is_dir($oldRoot) === false) {
+            $output->writeln('No old keys found: Nothing needs to be moved');
+            return false;
+        }
+
+        $this->prepareNewRoot($newRoot);
+        $this->moveSystemKeys($oldRoot, $newRoot);
+        $this->moveUserKeys($oldRoot, $newRoot, $output);
+
+        return true;
+    }
+
+    /**
+     * prepare new key storage
+     *
+     * @param string $newRoot
+     * @throws \Exception
+     */
+    protected function prepareNewRoot($newRoot) {
+        if ($this->rootView->is_dir($newRoot) === false) {
+            throw new \Exception("New root folder doesn't exist. Please create the folder or check the permissions and try again.");
+        }
+
+        $result = $this->rootView->file_put_contents(
+            $newRoot . '/' . Storage::KEY_STORAGE_MARKER,
+            'Nextcloud will detect this folder as key storage root only if this file exists'
+        );
+
+        if (!$result) {
+            throw new \Exception("Can't access the new root folder. Please check the permissions and make sure that the folder is in your data folder");
+        }
+    }
+
+
+    /**
+     * move system key folder
+     *
+     * @param string $oldRoot
+     * @param string $newRoot
+     */
+    protected function moveSystemKeys($oldRoot, $newRoot) {
+        if (
+            $this->rootView->is_dir($oldRoot . '/files_encryption') &&
+            $this->targetExists($newRoot . '/files_encryption') === false
+        ) {
+            $this->rootView->rename($oldRoot . '/files_encryption', $newRoot . '/files_encryption');
+        }
+    }
+
+
+    /**
+     * setup file system for the given user
+     *
+     * @param string $uid
+     */
+    protected function setupUserFS($uid) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($uid);
+    }
+
+
+    /**
+     * iterate over each user and move the keys to the new storage
+     *
+     * @param string $oldRoot
+     * @param string $newRoot
+     * @param OutputInterface $output
+     */
+    protected function moveUserKeys($oldRoot, $newRoot, OutputInterface $output) {
+        $progress = new ProgressBar($output);
+        $progress->start();
+
+
+        foreach ($this->userManager->getBackends() as $backend) {
+            $limit = 500;
+            $offset = 0;
+            do {
+                $users = $backend->getUsers('', $limit, $offset);
+                foreach ($users as $user) {
+                    $progress->advance();
+                    $this->setupUserFS($user);
+                    $this->moveUserEncryptionFolder($user, $oldRoot, $newRoot);
+                }
+                $offset += $limit;
+            } while (count($users) >= $limit);
+        }
+        $progress->finish();
+    }
+
+    /**
+     * move user encryption folder to new root folder
+     *
+     * @param string $user
+     * @param string $oldRoot
+     * @param string $newRoot
+     * @throws \Exception
+     */
+    protected function moveUserEncryptionFolder($user, $oldRoot, $newRoot) {
+        if ($this->userManager->userExists($user)) {
+            $source = $oldRoot . '/' . $user . '/files_encryption';
+            $target = $newRoot . '/' . $user . '/files_encryption';
+            if (
+                $this->rootView->is_dir($source) &&
+                $this->targetExists($target) === false
+            ) {
+                $this->prepareParentFolder($newRoot . '/' . $user);
+                $this->rootView->rename($source, $target);
+            }
+        }
+    }
+
+    /**
+     * Make preparations to filesystem for saving a key file
+     *
+     * @param string $path relative to data/
+     */
+    protected function prepareParentFolder($path) {
+        $path = Filesystem::normalizePath($path);
+        // If the file resides within a subdirectory, create it
+        if ($this->rootView->file_exists($path) === false) {
+            $sub_dirs = explode('/', ltrim($path, '/'));
+            $dir = '';
+            foreach ($sub_dirs as $sub_dir) {
+                $dir .= '/' . $sub_dir;
+                if ($this->rootView->file_exists($dir) === false) {
+                    $this->rootView->mkdir($dir);
+                }
+            }
+        }
+    }
+
+    /**
+     * check if target already exists
+     *
+     * @param $path
+     * @return bool
+     * @throws \Exception
+     */
+    protected function targetExists($path) {
+        if ($this->rootView->file_exists($path)) {
+            throw new \Exception("new folder '$path' already exists");
+        }
+
+        return false;
+    }
 }

core/Command/Config/System/DeleteConfig.php

Spacing +5 added lines, -5 removed lines

@@ -67,7 +67,7 @@ 
 
 		if (count($configNames) > 1) {
 			if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
-				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
+				$output->writeln('<error>System config '.implode(' => ', $configNames).' could not be deleted because it did not exist</error>');
 				return 1;
 			}
 
@@ -76,21 +76,21 @@ 
 			try {
 				$value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists'));
 			} catch (\UnexpectedValueException $e) {
-				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
+				$output->writeln('<error>System config '.implode(' => ', $configNames).' could not be deleted because it did not exist</error>');
 				return 1;
 			}
 
 			$this->systemConfig->setValue($configName, $value);
-			$output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' deleted</info>');
+			$output->writeln('<info>System config value '.implode(' => ', $configNames).' deleted</info>');
 			return 0;
 		} else {
 			if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
-				$output->writeln('<error>System config ' . $configName . ' could not be deleted because it did not exist</error>');
+				$output->writeln('<error>System config '.$configName.' could not be deleted because it did not exist</error>');
 				return 1;
 			}
 
 			$this->systemConfig->deleteValue($configName);
-			$output->writeln('<info>System config value ' . $configName . ' deleted</info>');
+			$output->writeln('<info>System config value '.$configName.' deleted</info>');
 			return 0;
 		}
 	}

Indentation +68 added lines, -68 removed lines

@@ -30,83 +30,83 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DeleteConfig extends Base {
-	public function __construct(
-		SystemConfig $systemConfig,
-	) {
-		parent::__construct($systemConfig);
-	}
+    public function __construct(
+        SystemConfig $systemConfig,
+    ) {
+        parent::__construct($systemConfig);
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('config:system:delete')
-			->setDescription('Delete a system config value')
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED | InputArgument::IS_ARRAY,
-				'Name of the config to delete, specify multiple for array parameter'
-			)
-			->addOption(
-				'error-if-not-exists',
-				null,
-				InputOption::VALUE_NONE,
-				'Checks whether the config exists before deleting it'
-			)
-		;
-	}
+        $this
+            ->setName('config:system:delete')
+            ->setDescription('Delete a system config value')
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED | InputArgument::IS_ARRAY,
+                'Name of the config to delete, specify multiple for array parameter'
+            )
+            ->addOption(
+                'error-if-not-exists',
+                null,
+                InputOption::VALUE_NONE,
+                'Checks whether the config exists before deleting it'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$configNames = $input->getArgument('name');
-		$configName = $configNames[0];
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $configNames = $input->getArgument('name');
+        $configName = $configNames[0];
 
-		if (count($configNames) > 1) {
-			if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
-				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
-				return 1;
-			}
+        if (count($configNames) > 1) {
+            if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
+                $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
+                return 1;
+            }
 
-			$value = $this->systemConfig->getValue($configName);
+            $value = $this->systemConfig->getValue($configName);
 
-			try {
-				$value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists'));
-			} catch (\UnexpectedValueException $e) {
-				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
-				return 1;
-			}
+            try {
+                $value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists'));
+            } catch (\UnexpectedValueException $e) {
+                $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
+                return 1;
+            }
 
-			$this->systemConfig->setValue($configName, $value);
-			$output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' deleted</info>');
-			return 0;
-		} else {
-			if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
-				$output->writeln('<error>System config ' . $configName . ' could not be deleted because it did not exist</error>');
-				return 1;
-			}
+            $this->systemConfig->setValue($configName, $value);
+            $output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' deleted</info>');
+            return 0;
+        } else {
+            if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
+                $output->writeln('<error>System config ' . $configName . ' could not be deleted because it did not exist</error>');
+                return 1;
+            }
 
-			$this->systemConfig->deleteValue($configName);
-			$output->writeln('<info>System config value ' . $configName . ' deleted</info>');
-			return 0;
-		}
-	}
+            $this->systemConfig->deleteValue($configName);
+            $output->writeln('<info>System config value ' . $configName . ' deleted</info>');
+            return 0;
+        }
+    }
 
-	protected function removeSubValue($keys, $currentValue, $throwError) {
-		$nextKey = array_shift($keys);
+    protected function removeSubValue($keys, $currentValue, $throwError) {
+        $nextKey = array_shift($keys);
 
-		if (is_array($currentValue)) {
-			if (isset($currentValue[$nextKey])) {
-				if (empty($keys)) {
-					unset($currentValue[$nextKey]);
-				} else {
-					$currentValue[$nextKey] = $this->removeSubValue($keys, $currentValue[$nextKey], $throwError);
-				}
-			} elseif ($throwError) {
-				throw new \UnexpectedValueException('Config parameter does not exist');
-			}
-		} elseif ($throwError) {
-			throw new \UnexpectedValueException('Config parameter does not exist');
-		}
+        if (is_array($currentValue)) {
+            if (isset($currentValue[$nextKey])) {
+                if (empty($keys)) {
+                    unset($currentValue[$nextKey]);
+                } else {
+                    $currentValue[$nextKey] = $this->removeSubValue($keys, $currentValue[$nextKey], $throwError);
+                }
+            } elseif ($throwError) {
+                throw new \UnexpectedValueException('Config parameter does not exist');
+            }
+        } elseif ($throwError) {
+            throw new \UnexpectedValueException('Config parameter does not exist');
+        }
 
-		return $currentValue;
-	}
+        return $currentValue;
+    }
 }

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

Spacing +4 added lines, -4 removed lines

@@ -52,10 +52,10 @@
 	 */
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->shares as $share) {
-			$writer->startElement('{' . self::NS_NEXTCLOUD . '}sharee');
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}id', $share->getSharedWith());
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}display-name', $share->getSharedWithDisplayName());
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}type', $share->getShareType());
+			$writer->startElement('{'.self::NS_NEXTCLOUD.'}sharee');
+			$writer->writeElement('{'.self::NS_NEXTCLOUD.'}id', $share->getSharedWith());
+			$writer->writeElement('{'.self::NS_NEXTCLOUD.'}display-name', $share->getSharedWithDisplayName());
+			$writer->writeElement('{'.self::NS_NEXTCLOUD.'}type', $share->getShareType());
 			$writer->endElement();
 		}
 	}

Indentation +21 added lines, -21 removed lines

@@ -16,27 +16,27 @@
  * This property contains multiple "sharee" elements, each containing a share sharee
  */
 class ShareeList implements XmlSerializable {
-	public const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
+    public const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
 
-	public function __construct(
-		/** @var IShare[] */
-		private array $shares,
-	) {
-	}
+    public function __construct(
+        /** @var IShare[] */
+        private array $shares,
+    ) {
+    }
 
-	/**
-	 * The xmlSerialize method is called during xml writing.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->shares as $share) {
-			$writer->startElement('{' . self::NS_NEXTCLOUD . '}sharee');
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}id', $share->getSharedWith());
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}display-name', $share->getSharedWithDisplayName());
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}type', $share->getShareType());
-			$writer->endElement();
-		}
-	}
+    /**
+     * The xmlSerialize method is called during xml writing.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->shares as $share) {
+            $writer->startElement('{' . self::NS_NEXTCLOUD . '}sharee');
+            $writer->writeElement('{' . self::NS_NEXTCLOUD . '}id', $share->getSharedWith());
+            $writer->writeElement('{' . self::NS_NEXTCLOUD . '}display-name', $share->getSharedWithDisplayName());
+            $writer->writeElement('{' . self::NS_NEXTCLOUD . '}type', $share->getShareType());
+            $writer->endElement();
+        }
+    }
 }

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

Indentation +18 added lines, -18 removed lines

@@ -29,26 +29,26 @@
 use Sabre\DAV\Server;
 
 class PasswordLoginForbidden extends NotAuthenticated {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	public function getHTTPCode() {
-		return 401;
-	}
+    public function getHTTPCode() {
+        return 401;
+    }
 
-	/**
-	 * This method allows the exception to include additional information
-	 * into the WebDAV error response
-	 *
-	 * @param Server $server
-	 * @param DOMElement $errorNode
-	 * @return void
-	 */
-	public function serialize(Server $server, DOMElement $errorNode) {
+    /**
+     * This method allows the exception to include additional information
+     * into the WebDAV error response
+     *
+     * @param Server $server
+     * @param DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(Server $server, DOMElement $errorNode) {
 
-		// set ownCloud namespace
-		$errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
+        // set ownCloud namespace
+        $errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
 
-		$error = $errorNode->ownerDocument->createElementNS('o:', 'o:hint', 'password login forbidden');
-		$errorNode->appendChild($error);
-	}
+        $error = $errorNode->ownerDocument->createElementNS('o:', 'o:hint', 'password login forbidden');
+        $errorNode->appendChild($error);
+    }
 }

apps/dav/lib/CalDAV/Principal/Collection.php

Indentation +9 added lines, -9 removed lines

@@ -30,13 +30,13 @@
  */
 class Collection extends \Sabre\CalDAV\Principal\Collection {
 
-	/**
-	 * Returns a child object based on principal information
-	 *
-	 * @param array $principalInfo
-	 * @return User
-	 */
-	public function getChildForPrincipal(array $principalInfo) {
-		return new User($this->principalBackend, $principalInfo);
-	}
+    /**
+     * Returns a child object based on principal information
+     *
+     * @param array $principalInfo
+     * @return User
+     */
+    public function getChildForPrincipal(array $principalInfo) {
+        return new User($this->principalBackend, $principalInfo);
+    }
 }

apps/dav/lib/CalDAV/Principal/User.php

Indentation +21 added lines, -21 removed lines

@@ -30,25 +30,25 @@
  */
 class User extends \Sabre\CalDAV\Principal\User {
 
-	/**
-	 * Returns a list of ACE's for this node.
-	 *
-	 * Each ACE has the following properties:
-	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-	 *     currently the only supported privileges
-	 *   * 'principal', a url to the principal who owns the node
-	 *   * 'protected' (optional), indicating that this ACE is not allowed to
-	 *      be updated.
-	 *
-	 * @return array
-	 */
-	public function getACL() {
-		$acl = parent::getACL();
-		$acl[] = [
-			'privilege' => '{DAV:}read',
-			'principal' => '{DAV:}authenticated',
-			'protected' => true,
-		];
-		return $acl;
-	}
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+        $acl = parent::getACL();
+        $acl[] = [
+            'privilege' => '{DAV:}read',
+            'principal' => '{DAV:}authenticated',
+            'protected' => true,
+        ];
+        return $acl;
+    }
 }

apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php

Indentation +12 added lines, -12 removed lines

@@ -32,17 +32,17 @@
 
 class OffsetFilter implements XmlDeserializable {
 
-	/**
-	 * @param Reader $reader
-	 * @throws BadRequest
-	 * @return int
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$value = $reader->parseInnerTree();
-		if (!is_int($value) && !is_string($value)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}offset has illegal value');
-		}
+    /**
+     * @param Reader $reader
+     * @throws BadRequest
+     * @return int
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $value = $reader->parseInnerTree();
+        if (!is_int($value) && !is_string($value)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}offset has illegal value');
+        }
 
-		return (int)$value;
-	}
+        return (int)$value;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -40,9 +40,9 @@
 	public static function xmlDeserialize(Reader $reader) {
 		$value = $reader->parseInnerTree();
 		if (!is_int($value) && !is_string($value)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}offset has illegal value');
+			throw new BadRequest('The {'.SearchPlugin::NS_Nextcloud.'}offset has illegal value');
 		}
 
-		return (int)$value;
+		return (int) $value;
 	}
 }

apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php

Indentation +12 added lines, -12 removed lines

@@ -32,17 +32,17 @@
 
 class LimitFilter implements XmlDeserializable {
 
-	/**
-	 * @param Reader $reader
-	 * @throws BadRequest
-	 * @return int
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$value = $reader->parseInnerTree();
-		if (!is_int($value) && !is_string($value)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}limit has illegal value');
-		}
+    /**
+     * @param Reader $reader
+     * @throws BadRequest
+     * @return int
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $value = $reader->parseInnerTree();
+        if (!is_int($value) && !is_string($value)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}limit has illegal value');
+        }
 
-		return (int)$value;
-	}
+        return (int)$value;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -40,9 +40,9 @@
 	public static function xmlDeserialize(Reader $reader) {
 		$value = $reader->parseInnerTree();
 		if (!is_int($value) && !is_string($value)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}limit has illegal value');
+			throw new BadRequest('The {'.SearchPlugin::NS_Nextcloud.'}limit has illegal value');
 		}
 
-		return (int)$value;
+		return (int) $value;
 	}
 }