nextcloud / server

apps/comments/lib/Collaboration/CommentersSorter.php

Spacing +2 added lines, -2 removed lines

@@ -60,11 +60,11 @@
 			// at least on PHP 5.6 usort turned out to be not stable. So we add
 			// the current index to the value and compare it on a draw
 			$i = 0;
-			$workArray = array_map(function ($element) use (&$i) {
+			$workArray = array_map(function($element) use (&$i) {
 				return [$i++, $element];
 			}, $byType);
 
-			usort($workArray, function ($a, $b) use ($commenters, $type) {
+			usort($workArray, function($a, $b) use ($commenters, $type) {
 				$r = $this->compare($a[1], $b[1], $commenters[$type]);
 				if ($r === 0) {
 					$r = $a[0] - $b[0];

Indentation +68 added lines, -68 removed lines

@@ -9,83 +9,83 @@
 use OCP\Comments\ICommentsManager;
 
 class CommentersSorter implements ISorter {
-	public function __construct(
-		private ICommentsManager $commentsManager,
-	) {
-	}
+    public function __construct(
+        private ICommentsManager $commentsManager,
+    ) {
+    }
 
-	public function getId(): string {
-		return 'commenters';
-	}
+    public function getId(): string {
+        return 'commenters';
+    }
 
-	/**
-	 * Sorts people who commented on the given item atop (descelating) of the
-	 * others
-	 *
-	 * @param array &$sortArray
-	 * @param array $context
-	 */
-	public function sort(array &$sortArray, array $context): void {
-		$commenters = $this->retrieveCommentsInformation($context['itemType'], $context['itemId']);
-		if (count($commenters) === 0) {
-			return;
-		}
+    /**
+     * Sorts people who commented on the given item atop (descelating) of the
+     * others
+     *
+     * @param array &$sortArray
+     * @param array $context
+     */
+    public function sort(array &$sortArray, array $context): void {
+        $commenters = $this->retrieveCommentsInformation($context['itemType'], $context['itemId']);
+        if (count($commenters) === 0) {
+            return;
+        }
 
-		foreach ($sortArray as $type => &$byType) {
-			if (!isset($commenters[$type])) {
-				continue;
-			}
+        foreach ($sortArray as $type => &$byType) {
+            if (!isset($commenters[$type])) {
+                continue;
+            }
 
-			// at least on PHP 5.6 usort turned out to be not stable. So we add
-			// the current index to the value and compare it on a draw
-			$i = 0;
-			$workArray = array_map(function ($element) use (&$i) {
-				return [$i++, $element];
-			}, $byType);
+            // at least on PHP 5.6 usort turned out to be not stable. So we add
+            // the current index to the value and compare it on a draw
+            $i = 0;
+            $workArray = array_map(function ($element) use (&$i) {
+                return [$i++, $element];
+            }, $byType);
 
-			usort($workArray, function ($a, $b) use ($commenters, $type) {
-				$r = $this->compare($a[1], $b[1], $commenters[$type]);
-				if ($r === 0) {
-					$r = $a[0] - $b[0];
-				}
-				return $r;
-			});
+            usort($workArray, function ($a, $b) use ($commenters, $type) {
+                $r = $this->compare($a[1], $b[1], $commenters[$type]);
+                if ($r === 0) {
+                    $r = $a[0] - $b[0];
+                }
+                return $r;
+            });
 
-			// and remove the index values again
-			$byType = array_column($workArray, 1);
-		}
-	}
+            // and remove the index values again
+            $byType = array_column($workArray, 1);
+        }
+    }
 
-	/**
-	 * @return array<string, array<string, int>>
-	 */
-	protected function retrieveCommentsInformation(string $type, string $id): array {
-		$comments = $this->commentsManager->getForObject($type, $id);
-		if (count($comments) === 0) {
-			return [];
-		}
+    /**
+     * @return array<string, array<string, int>>
+     */
+    protected function retrieveCommentsInformation(string $type, string $id): array {
+        $comments = $this->commentsManager->getForObject($type, $id);
+        if (count($comments) === 0) {
+            return [];
+        }
 
-		$actors = [];
-		foreach ($comments as $comment) {
-			if (!isset($actors[$comment->getActorType()])) {
-				$actors[$comment->getActorType()] = [];
-			}
-			if (!isset($actors[$comment->getActorType()][$comment->getActorId()])) {
-				$actors[$comment->getActorType()][$comment->getActorId()] = 1;
-			} else {
-				$actors[$comment->getActorType()][$comment->getActorId()]++;
-			}
-		}
-		return $actors;
-	}
+        $actors = [];
+        foreach ($comments as $comment) {
+            if (!isset($actors[$comment->getActorType()])) {
+                $actors[$comment->getActorType()] = [];
+            }
+            if (!isset($actors[$comment->getActorType()][$comment->getActorId()])) {
+                $actors[$comment->getActorType()][$comment->getActorId()] = 1;
+            } else {
+                $actors[$comment->getActorType()][$comment->getActorId()]++;
+            }
+        }
+        return $actors;
+    }
 
-	protected function compare(array $a, array $b, array $commenters): int {
-		$a = $a['value']['shareWith'];
-		$b = $b['value']['shareWith'];
+    protected function compare(array $a, array $b, array $commenters): int {
+        $a = $a['value']['shareWith'];
+        $b = $b['value']['shareWith'];
 
-		$valueA = $commenters[$a] ?? 0;
-		$valueB = $commenters[$b] ?? 0;
+        $valueA = $commenters[$a] ?? 0;
+        $valueB = $commenters[$b] ?? 0;
 
-		return $valueB - $valueA;
-	}
+        return $valueB - $valueA;
+    }
 }

core/templates/404.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 	require_once '../../lib/base.php';
 
 	$urlGenerator = \OC::$server->getURLGenerator();
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
+	header('Location: '.$urlGenerator->getAbsoluteURL('/'));
 	exit;
 }
 // @codeCoverageIgnoreEnd

Indentation +4 added lines, -4 removed lines

@@ -4,11 +4,11 @@
 /** @var \OCP\Defaults $theme */
 // @codeCoverageIgnoreStart
 if (!isset($_)) {//standalone  page is not supported anymore - redirect to /
-	require_once '../../lib/base.php';
+    require_once '../../lib/base.php';
 
-	$urlGenerator = \OC::$server->getURLGenerator();
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
-	exit;
+    $urlGenerator = \OC::$server->getURLGenerator();
+    header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
+    exit;
 }
 // @codeCoverageIgnoreEnd
 ?>

Braces +5 added lines, -2 removed lines

@@ -14,10 +14,13 @@
 ?>
 <?php if (isset($_['content'])): ?>
 	<?php print_unescaped($_['content']) ?>
-<?php else: ?>
+<?php else {
+    : ?>
 	<div class="body-login-container update">
 		<div class="icon-big icon-search"></div>
-		<h2><?php p($l->t('Page not found')); ?></h2>
+		<h2><?php p($l->t('Page not found'));
+}
+?></h2>
 		<p class="infogroup"><?php p($l->t('The page could not be found on the server or you may not be allowed to view it.')); ?></p>
 		<p><a class="button primary" href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>">
 			<?php p($l->t('Back to %s', [$theme->getName()])); ?>

core/templates/loginflow/authpicker.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+			'<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>',
 			\OCP\Util::sanitizeHTML($_['instanceName'])
 		])) ?>
 	</p>

Indentation +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
-			\OCP\Util::sanitizeHTML($_['instanceName'])
-		])) ?>
+            '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+            \OCP\Util::sanitizeHTML($_['instanceName'])
+        ])) ?>
 	</p>
 
 	<div class="notecard warning">

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/templates/twofactorselectchallenge.php

Braces +13 added lines, -5 removed lines

@@ -27,11 +27,15 @@ 
 					<?php p($l->t('Set up two-factor authentication')) ?>
 				</a>
 			<?php } ?>
-		<?php else: ?>
+		<?php else {
+    : ?>
 			<strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance.')) ?></strong>
-		<?php endif; ?>
+		<?php endif;
+}
+?>
 	</p>
-	<?php else: ?>
+	<?php else {
+    : ?>
 	<ul>
 	<?php foreach ($_['providers'] as $provider): ?>
 		<li>
@@ -45,6 +49,7 @@ 
 				<?php
 				if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
 					$icon = $provider->getLightIcon();
+}
 				} else {
 					$icon = image_path('core', 'actions/password-white.svg');
 				}
@@ -61,7 +66,8 @@ 
 	<?php endif ?>
 	<?php if (!is_null($_['backupProvider'])): ?>
 	<p>
-		<a class="<?php if ($noProviders): ?>button primary two-factor-primary<?php else: ?>two-factor-secondary<?php endif ?>" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
+		<a class="<?php if ($noProviders): ?>button primary two-factor-primary<?php else {
+    : ?>two-factor-secondary<?php endif ?>" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
 			[
 				'challengeProviderId' => $_['backupProvider']->getId(),
 				'redirect_url' => $_['redirect_url'],
@@ -70,7 +76,9 @@ 
 			<?php p($l->t('Use backup code')) ?>
 		</a>
 	</p>
-	<?php endif; ?>
+	<?php endif;
+}
+?>
 	<p><a class="two-factor-secondary" href="<?php print_unescaped($_['logout_url']); ?>">
 		<?php p($l->t('Cancel login')) ?>
 	</a></p>

Indentation +20 added lines, -20 removed lines

@@ -20,10 +20,10 @@ 
 			<?php } else { ?>
 				<strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Please continue to setup two-factor authentication.')) ?></strong>
 				<a class="button primary two-factor-primary" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.setupProviders',
-					[
-						'redirect_url' => $_['redirect_url'],
-					]
-				)) ?>">
+                    [
+                        'redirect_url' => $_['redirect_url'],
+                    ]
+                )) ?>">
 					<?php p($l->t('Set up two-factor authentication')) ?>
 				</a>
 			<?php } ?>
@@ -37,18 +37,18 @@ 
 		<li>
 			<a class="two-factor-provider"
 			   href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
-			   	[
-			   		'challengeProviderId' => $provider->getId(),
-			   		'redirect_url' => $_['redirect_url'],
-			   	]
-			   )) ?>">
+                    [
+                        'challengeProviderId' => $provider->getId(),
+                        'redirect_url' => $_['redirect_url'],
+                    ]
+                )) ?>">
 				<?php
-				if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
-					$icon = $provider->getLightIcon();
-				} else {
-					$icon = image_path('core', 'actions/password-white.svg');
-				}
-		?>
+                if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
+                    $icon = $provider->getLightIcon();
+                } else {
+                    $icon = image_path('core', 'actions/password-white.svg');
+                }
+        ?>
 				<img src="<?php p($icon) ?>" alt="" />
 				<div>
 					<h3><?php p($provider->getDisplayName()) ?></h3>
@@ -62,11 +62,11 @@ 
 	<?php if (!is_null($_['backupProvider'])): ?>
 	<p>
 		<a class="<?php if ($noProviders): ?>button primary two-factor-primary<?php else: ?>two-factor-secondary<?php endif ?>" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
-			[
-				'challengeProviderId' => $_['backupProvider']->getId(),
-				'redirect_url' => $_['redirect_url'],
-			]
-		)) ?>">
+            [
+                'challengeProviderId' => $_['backupProvider']->getId(),
+                'redirect_url' => $_['redirect_url'],
+            ]
+        )) ?>">
 			<?php p($l->t('Use backup code')) ?>
 		</a>
 	</p>

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;
+    }
 }

core/Migrations/Version14000Date20180626223656.php

Indentation +37 added lines, -37 removed lines

@@ -28,42 +28,42 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version14000Date20180626223656 extends SimpleMigrationStep {
-	public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		if (!$schema->hasTable('whats_new')) {
-			$table = $schema->createTable('whats_new');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('version', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '11',
-			]);
-			$table->addColumn('etag', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('last_check', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-				'default' => 0,
-			]);
-			$table->addColumn('data', 'text', [
-				'notnull' => true,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['version'], 'version');
-			$table->addIndex(['version', 'etag'], 'version_etag_idx');
-		}
+    public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        if (!$schema->hasTable('whats_new')) {
+            $table = $schema->createTable('whats_new');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('version', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '11',
+            ]);
+            $table->addColumn('etag', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('last_check', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+                'default' => 0,
+            ]);
+            $table->addColumn('data', 'text', [
+                'notnull' => true,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['version'], 'version');
+            $table->addIndex(['version', 'etag'], 'version_etag_idx');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

core/templates/403.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 	require_once '../../lib/base.php';
 
 	$urlGenerator = \OC::$server->getURLGenerator();
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
+	header('Location: '.$urlGenerator->getAbsoluteURL('/'));
 	exit;
 }
 // @codeCoverageIgnoreEnd

Indentation +6 added lines, -6 removed lines

@@ -6,17 +6,17 @@
  */
 // @codeCoverageIgnoreStart
 if (!isset($_)) {//standalone  page is not supported anymore - redirect to /
-	require_once '../../lib/base.php';
+    require_once '../../lib/base.php';
 
-	$urlGenerator = \OC::$server->getURLGenerator();
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
-	exit;
+    $urlGenerator = \OC::$server->getURLGenerator();
+    header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
+    exit;
 }
 // @codeCoverageIgnoreEnd
 ?>
 <div class="guest-box">
 	<h2><?php p($l->t('Access forbidden')); ?></h2>
 		<p class='hint'><?php if (isset($_['message'])) {
-			p($_['message']);
-		}?></p>
+            p($_['message']);
+        }?></p>
 </ul>