nextcloud / server

core/Command/Encryption/ChangeKeyStorageRoot.php

Indentation +228 added lines, -228 removed lines

@@ -39,233 +39,233 @@
 
 class ChangeKeyStorageRoot extends Command {
 
-	/** @var View  */
-	protected $rootView;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IConfig  */
-	protected $config;
-
-	/** @var Util  */
-	protected $util;
-
-	/** @var QuestionHelper */
-	protected $questionHelper;
-
-	/**
-	 * @param View $view
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param Util $util
-	 * @param QuestionHelper $questionHelper
-	 */
-	public function __construct(View $view, IUserManager $userManager, IConfig $config, Util $util, QuestionHelper $questionHelper) {
-		parent::__construct();
-		$this->rootView = $view;
-		$this->userManager = $userManager;
-		$this->config = $config;
-		$this->util = $util;
-		$this->questionHelper = $questionHelper;
-	}
-
-	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) {
-		$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;
-			}
-			$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>");
-		}
-	}
-
-	/**
-	 * 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,
-			'ownCloud will detect this folder as key storage root only if this file exists'
-		);
-
-		if ($result === false) {
-			throw new \Exception("Can't write to new root folder. Please check the permissions and try again");
-		}
-
-	}
-
-
-	/**
-	 * 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;
-	}
+    /** @var View  */
+    protected $rootView;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IConfig  */
+    protected $config;
+
+    /** @var Util  */
+    protected $util;
+
+    /** @var QuestionHelper */
+    protected $questionHelper;
+
+    /**
+     * @param View $view
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param Util $util
+     * @param QuestionHelper $questionHelper
+     */
+    public function __construct(View $view, IUserManager $userManager, IConfig $config, Util $util, QuestionHelper $questionHelper) {
+        parent::__construct();
+        $this->rootView = $view;
+        $this->userManager = $userManager;
+        $this->config = $config;
+        $this->util = $util;
+        $this->questionHelper = $questionHelper;
+    }
+
+    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) {
+        $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;
+            }
+            $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>");
+        }
+    }
+
+    /**
+     * 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,
+            'ownCloud will detect this folder as key storage root only if this file exists'
+        );
+
+        if ($result === false) {
+            throw new \Exception("Can't write to new root folder. Please check the permissions and try again");
+        }
+
+    }
+
+
+    /**
+     * 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;
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -142,7 +142,7 @@ 
 		}
 
 		$result = $this->rootView->file_put_contents(
-			$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
+			$newRoot.'/'.Storage::KEY_STORAGE_MARKER,
 			'ownCloud will detect this folder as key storage root only if this file exists'
 		);
 
@@ -161,10 +161,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');
 		}
 	}
 
@@ -193,7 +193,7 @@ 
 		$progress->start();
 
 
-		foreach($this->userManager->getBackends() as $backend) {
+		foreach ($this->userManager->getBackends() as $backend) {
 			$limit = 500;
 			$offset = 0;
 			do {
@@ -204,7 +204,7 @@ 
 					$this->moveUserEncryptionFolder($user, $oldRoot, $newRoot);
 				}
 				$offset += $limit;
-			} while(count($users) >= $limit);
+			} while (count($users) >= $limit);
 		}
 		$progress->finish();
 	}
@@ -221,13 +221,13 @@ 
 
 		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);
 			}
 		}
@@ -245,7 +245,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);
 				}

core/Command/Encryption/SetDefaultModule.php

Indentation +31 added lines, -31 removed lines

@@ -30,40 +30,40 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetDefaultModule extends Command {
-	/** @var IManager */
-	protected $encryptionManager;
+    /** @var IManager */
+    protected $encryptionManager;
 
-	/**
-	 * @param IManager $encryptionManager
-	 */
-	public function __construct(IManager $encryptionManager) {
-		parent::__construct();
-		$this->encryptionManager = $encryptionManager;
-	}
+    /**
+     * @param IManager $encryptionManager
+     */
+    public function __construct(IManager $encryptionManager) {
+        parent::__construct();
+        $this->encryptionManager = $encryptionManager;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('encryption:set-default-module')
-			->setDescription('Set the encryption default module')
-			->addArgument(
-				'module',
-				InputArgument::REQUIRED,
-				'ID of the encryption module that should be used'
-			)
-		;
-	}
+        $this
+            ->setName('encryption:set-default-module')
+            ->setDescription('Set the encryption default module')
+            ->addArgument(
+                'module',
+                InputArgument::REQUIRED,
+                'ID of the encryption module that should be used'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$moduleId = $input->getArgument('module');
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $moduleId = $input->getArgument('module');
 
-		if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
-			$output->writeln('"' . $moduleId . '"" is already the default module');
-		} else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
-			$output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
-		} else {
-			$output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
-		}
-	}
+        if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
+            $output->writeln('"' . $moduleId . '"" is already the default module');
+        } else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
+            $output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
+        } else {
+            $output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -59,11 +59,11 @@
 		$moduleId = $input->getArgument('module');
 
 		if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
-			$output->writeln('"' . $moduleId . '"" is already the default module');
+			$output->writeln('"'.$moduleId.'"" is already the default module');
 		} else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
-			$output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
+			$output->writeln('<info>Set default module to "'.$moduleId.'"</info>');
 		} else {
-			$output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
+			$output->writeln('<error>The specified module "'.$moduleId.'" does not exist</error>');
 		}
 	}
 }

core/Command/Group/ListCommand.php

Indentation +50 added lines, -50 removed lines

@@ -34,58 +34,58 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListCommand extends Base {
-	/** @var IGroupManager */
-	protected $groupManager;
+    /** @var IGroupManager */
+    protected $groupManager;
 
-	/**
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IGroupManager $groupManager) {
-		$this->groupManager = $groupManager;
-		parent::__construct();
-	}
+    /**
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IGroupManager $groupManager) {
+        $this->groupManager = $groupManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('group:list')
-			->setDescription('list configured groups')
-			->addOption(
-				'limit',
-				'l',
-				InputOption::VALUE_OPTIONAL,
-				'Number of groups to retrieve',
-				500
-			)->addOption(
-				'offset',
-				'o',
-				InputOption::VALUE_OPTIONAL,
-				'Offset for retrieving groups',
-				0
-			)->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('group:list')
+            ->setDescription('list configured groups')
+            ->addOption(
+                'limit',
+                'l',
+                InputOption::VALUE_OPTIONAL,
+                'Number of groups to retrieve',
+                500
+            )->addOption(
+                'offset',
+                'o',
+                InputOption::VALUE_OPTIONAL,
+                'Offset for retrieving groups',
+                0
+            )->addOption(
+                'output',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Output format (plain, json or json_pretty, default is plain)',
+                $this->defaultOutputFormat
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
-		$this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups));
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
+        $this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups));
+    }
 
-	/**
-	 * @param IGroup[] $groups
-	 * @return array
-	 */
-	private function formatGroups(array $groups) {
-		$keys = array_map(function (IGroup $group) {
-			return $group->getGID();
-		}, $groups);
-		$values = array_map(function (IGroup $group) {
-			return array_keys($group->getUsers());
-		}, $groups);
-		return array_combine($keys, $values);
-	}
+    /**
+     * @param IGroup[] $groups
+     * @return array
+     */
+    private function formatGroups(array $groups) {
+        $keys = array_map(function (IGroup $group) {
+            return $group->getGID();
+        }, $groups);
+        $values = array_map(function (IGroup $group) {
+            return array_keys($group->getUsers());
+        }, $groups);
+        return array_combine($keys, $values);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		$groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
+		$groups = $this->groupManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset'));
 		$this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups));
 	}
 
@@ -80,10 +80,10 @@ 
 	 * @return array
 	 */
 	private function formatGroups(array $groups) {
-		$keys = array_map(function (IGroup $group) {
+		$keys = array_map(function(IGroup $group) {
 			return $group->getGID();
 		}, $groups);
-		$values = array_map(function (IGroup $group) {
+		$values = array_map(function(IGroup $group) {
 			return array_keys($group->getUsers());
 		}, $groups);
 		return array_combine($keys, $values);

core/Command/Group/RemoveUser.php

Indentation +40 added lines, -40 removed lines

@@ -33,47 +33,47 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class RemoveUser extends Base {
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IGroupManager */
-	protected $groupManager;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IGroupManager */
+    protected $groupManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('group:removeuser')
-			->setDescription('remove a user from a group')
-			->addArgument(
-				'group',
-				InputArgument::REQUIRED,
-				'group to remove the user from'
-			)->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'user to remove from the group'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('group:removeuser')
+            ->setDescription('remove a user from a group')
+            ->addArgument(
+                'group',
+                InputArgument::REQUIRED,
+                'group to remove the user from'
+            )->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'user to remove from the group'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$group = $this->groupManager->get($input->getArgument('group'));
-		if (is_null($group)) {
-			$output->writeln('<error>group not found</error>');
-			return 1;
-		}
-		$user = $this->userManager->get($input->getArgument('user'));
-		if (is_null($user)) {
-			$output->writeln('<error>user not found</error>');
-			return 1;
-		}
-		$group->removeUser($user);
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $group = $this->groupManager->get($input->getArgument('group'));
+        if (is_null($group)) {
+            $output->writeln('<error>group not found</error>');
+            return 1;
+        }
+        $user = $this->userManager->get($input->getArgument('user'));
+        if (is_null($user)) {
+            $output->writeln('<error>user not found</error>');
+            return 1;
+        }
+        $group->removeUser($user);
+    }
 }

core/Command/Group/AddUser.php

Indentation +40 added lines, -40 removed lines

@@ -33,47 +33,47 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class AddUser extends Base {
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IGroupManager */
-	protected $groupManager;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IGroupManager */
+    protected $groupManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('group:adduser')
-			->setDescription('add a user to a group')
-			->addArgument(
-				'group',
-				InputArgument::REQUIRED,
-				'group to add the user to'
-			)->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'user to add to the group'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('group:adduser')
+            ->setDescription('add a user to a group')
+            ->addArgument(
+                'group',
+                InputArgument::REQUIRED,
+                'group to add the user to'
+            )->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'user to add to the group'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$group = $this->groupManager->get($input->getArgument('group'));
-		if (is_null($group)) {
-			$output->writeln('<error>group not found</error>');
-			return 1;
-		}
-		$user = $this->userManager->get($input->getArgument('user'));
-		if (is_null($user)) {
-			$output->writeln('<error>user not found</error>');
-			return 1;
-		}
-		$group->addUser($user);
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $group = $this->groupManager->get($input->getArgument('group'));
+        if (is_null($group)) {
+            $output->writeln('<error>group not found</error>');
+            return 1;
+        }
+        $user = $this->userManager->get($input->getArgument('user'));
+        if (is_null($user)) {
+            $output->writeln('<error>user not found</error>');
+            return 1;
+        }
+        $group->addUser($user);
+    }
 }

settings/templates/settings.php

Indentation +1 added lines, -1 removed lines

@@ -5,5 +5,5 @@
  */?>
 
 <?php foreach($_['forms'] as $form) {
-	print_unescaped($form);
+    print_unescaped($form);
 };

Spacing +1 added lines, -1 removed lines

@@ -4,6 +4,6 @@
  * See the COPYING-README file.
  */?>
 
-<?php foreach($_['forms'] as $form) {
+<?php foreach ($_['forms'] as $form) {
 	print_unescaped($form);
 };

settings/templates/users/part.setquota.php

Spacing +19 added lines, -19 removed lines

@@ -1,35 +1,35 @@
 <div class="quota">
 	<!-- Default storage -->
-	<span><?php p($l->t('Default quota'));?></span>
-	<?php if((bool) $_['isAdmin']): ?>
+	<span><?php p($l->t('Default quota')); ?></span>
+	<?php if ((bool) $_['isAdmin']): ?>
 		<select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s">
-			<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
-				<?php p($l->t('Unlimited'));?>
+			<option <?php if ($_['default_quota'] === 'none') print_unescaped('selected="selected"'); ?> value='none'>
+				<?php p($l->t('Unlimited')); ?>
 			</option>
-			<?php foreach($_['quota_preset'] as $preset):?>
-				<?php if($preset !== 'default'):?>
-					<option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'>
-						<?php p($preset);?>
+			<?php foreach ($_['quota_preset'] as $preset):?>
+				<?php if ($preset !== 'default'):?>
+					<option <?php if ($_['default_quota'] == $preset) print_unescaped('selected="selected"'); ?> value='<?php p($preset); ?>'>
+						<?php p($preset); ?>
 					</option>
-				<?php endif;?>
-			<?php endforeach;?>
-			<?php if($_['defaultQuotaIsUserDefined']):?>
-				<option selected="selected" value='<?php p($_['default_quota']);?>'>
-					<?php p($_['default_quota']);?>
+				<?php endif; ?>
+			<?php endforeach; ?>
+			<?php if ($_['defaultQuotaIsUserDefined']):?>
+				<option selected="selected" value='<?php p($_['default_quota']); ?>'>
+					<?php p($_['default_quota']); ?>
 				</option>
-			<?php endif;?>
+			<?php endif; ?>
 			<option data-new value='other'>
-				<?php p($l->t('Other'));?>
+				<?php p($l->t('Other')); ?>
 				...
 			</option>
 		</select>
 	<?php endif; ?>
-	<?php if((bool) !$_['isAdmin']): ?>
+	<?php if ((bool) !$_['isAdmin']): ?>
 		:
-		<?php if( $_['default_quota'] === 'none'): ?>
-			<?php p($l->t('Unlimited'));?>
+		<?php if ($_['default_quota'] === 'none'): ?>
+			<?php p($l->t('Unlimited')); ?>
 		<?php else: ?>
-			<?php p($_['default_quota']);?>
+			<?php p($_['default_quota']); ?>
 		<?php endif; ?>
 	<?php endif; ?>
 </div>

Braces +13 added lines, -4 removed lines

@@ -3,12 +3,18 @@ 
 	<span><?php p($l->t('Default quota'));?></span>
 	<?php if((bool) $_['isAdmin']): ?>
 		<select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s">
-			<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
+			<option <?php if($_['default_quota'] === 'none') {
+    print_unescaped('selected="selected"');
+}
+?> value='none'>
 				<?php p($l->t('Unlimited'));?>
 			</option>
 			<?php foreach($_['quota_preset'] as $preset):?>
 				<?php if($preset !== 'default'):?>
-					<option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'>
+					<option <?php if($_['default_quota']==$preset) {
+    print_unescaped('selected="selected"');
+}
+?> value='<?php p($preset);?>'>
 						<?php p($preset);?>
 					</option>
 				<?php endif;?>
@@ -28,8 +34,11 @@ 
 		:
 		<?php if( $_['default_quota'] === 'none'): ?>
 			<?php p($l->t('Unlimited'));?>
-		<?php else: ?>
-			<?php p($_['default_quota']);?>
+		<?php else {
+    : ?>
+			<?php p($_['default_quota']);
+}
+?>
 		<?php endif; ?>
 	<?php endif; ?>
 </div>

settings/templates/users/main.php

Indentation +8 added lines, -8 removed lines

@@ -6,24 +6,24 @@
  */
 
 script('settings', [
-	'users/deleteHandler',
-	'users/filter',
-	'users/users',
-	'users/groups'
+    'users/deleteHandler',
+    'users/filter',
+    'users/users',
+    'users/groups'
 ]);
 script('core', [
-	'multiselect',
-	'singleselect'
+    'multiselect',
+    'singleselect'
 ]);
 style('settings', 'settings');
 
 $userlistParams = array();
 $allGroups=array();
 foreach($_["adminGroup"] as $group) {
-	$allGroups[] = $group['name'];
+    $allGroups[] = $group['name'];
 }
 foreach($_["groups"] as $group) {
-	$allGroups[] = $group['name'];
+    $allGroups[] = $group['name'];
 }
 $userlistParams['subadmingroups'] = $allGroups;
 $userlistParams['allGroups'] = json_encode($allGroups);

Braces +20 added lines, -5 removed lines

@@ -46,35 +46,50 @@
 			<div id="userlistoptions">
 				<p>
 					<input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation"
-						class="checkbox" <?php if ($_['show_storage_location'] === 'true') print_unescaped('checked="checked"'); ?> />
+						class="checkbox" <?php if ($_['show_storage_location'] === 'true') {
+    print_unescaped('checked="checked"');
+}
+?> />
 					<label for="CheckboxStorageLocation">
 						<?php p($l->t('Show storage location')) ?>
 					</label>
 				</p>
 				<p>
 					<input type="checkbox" name="UserBackend" value="UserBackend" id="CheckboxUserBackend"
-						class="checkbox" <?php if ($_['show_backend'] === 'true') print_unescaped('checked="checked"'); ?> />
+						class="checkbox" <?php if ($_['show_backend'] === 'true') {
+    print_unescaped('checked="checked"');
+}
+?> />
 					<label for="CheckboxUserBackend">
 						<?php p($l->t('Show user backend')) ?>
 					</label>
 				</p>
 				<p>
 					<input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin"
-						class="checkbox" <?php if ($_['show_last_login'] === 'true') print_unescaped('checked="checked"'); ?> />
+						class="checkbox" <?php if ($_['show_last_login'] === 'true') {
+    print_unescaped('checked="checked"');
+}
+?> />
 					<label for="CheckboxLastLogin">
 						<?php p($l->t('Show last login')) ?>
 					</label>
 				</p>
 				<p>
 					<input type="checkbox" name="EmailAddress" value="EmailAddress" id="CheckboxEmailAddress"
-						class="checkbox" <?php if ($_['show_email'] === 'true') print_unescaped('checked="checked"'); ?> />
+						class="checkbox" <?php if ($_['show_email'] === 'true') {
+    print_unescaped('checked="checked"');
+}
+?> />
 					<label for="CheckboxEmailAddress">
 						<?php p($l->t('Show email address')) ?>
 					</label>
 				</p>
 				<p>
 					<input type="checkbox" name="MailOnUserCreate" value="MailOnUserCreate" id="CheckboxMailOnUserCreate"
-						class="checkbox" <?php if ($_['send_email'] === 'true') print_unescaped('checked="checked"'); ?> />
+						class="checkbox" <?php if ($_['send_email'] === 'true') {
+    print_unescaped('checked="checked"');
+}
+?> />
 					<label for="CheckboxMailOnUserCreate">
 						<?php p($l->t('Send email to new user')) ?>
 					</label>

Spacing +4 added lines, -4 removed lines

@@ -18,11 +18,11 @@ 
 style('settings', 'settings');
 
 $userlistParams = array();
-$allGroups=array();
-foreach($_["adminGroup"] as $group) {
+$allGroups = array();
+foreach ($_["adminGroup"] as $group) {
 	$allGroups[] = $group['name'];
 }
-foreach($_["groups"] as $group) {
+foreach ($_["groups"] as $group) {
 	$allGroups[] = $group['name'];
 }
 $userlistParams['subadmingroups'] = $allGroups;
@@ -38,7 +38,7 @@ 
 	<?php print_unescaped($this->inc('users/part.grouplist')); ?>
 	<div id="app-settings">
 		<div id="app-settings-header">
-			<button class="settings-button" tabindex="0" data-apps-slide-toggle="#app-settings-content"><?php p($l->t('Settings'));?></button>
+			<button class="settings-button" tabindex="0" data-apps-slide-toggle="#app-settings-content"><?php p($l->t('Settings')); ?></button>
 		</div>
 		<div id="app-settings-content">
 			<?php print_unescaped($this->inc('users/part.setquota')); ?>

settings/templates/users/part.createuser.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 		<div class="groups"><div class="groupsListContainer multiselect button" data-placeholder="<?php p($l->t('Groups'))?>"><span class="title groupsList"></span><span class="icon-triangle-s"></span></div></div>
 		<input type="submit" class="button" value="<?php p($l->t('Create'))?>" />
 	</form>
-	<?php if((bool)$_['recoveryAdminEnabled']): ?>
+	<?php if ((bool) $_['recoveryAdminEnabled']): ?>
 	<div class="recoveryPassword">
 	<input id="recoveryPassword"
 		   type="password"