nextcloud / server

core/Command/Integrity/CheckCore.php

Indentation +27 added lines, -27 removed lines

@@ -34,34 +34,34 @@
  * @package OC\Core\Command\Integrity
  */
 class CheckCore extends Base {
-	/**
-	 * @var Checker
-	 */
-	private $checker;
+    /**
+     * @var Checker
+     */
+    private $checker;
 
-	public function __construct(Checker $checker) {
-		parent::__construct();
-		$this->checker = $checker;
-	}
+    public function __construct(Checker $checker) {
+        parent::__construct();
+        $this->checker = $checker;
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function configure() {
-		parent::configure();
-		$this
-			->setName('integrity:check-core')
-			->setDescription('Check integrity of core code using a signature.');
-	}
+    /**
+     * {@inheritdoc }
+     */
+    protected function configure() {
+        parent::configure();
+        $this
+            ->setName('integrity:check-core')
+            ->setDescription('Check integrity of core code using a signature.');
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$result = $this->checker->verifyCoreSignature();
-		$this->writeArrayInOutputFormat($input, $output, $result);
-		if (count($result)>0){
-			return 1;
-		}
-	}
+    /**
+     * {@inheritdoc }
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $result = $this->checker->verifyCoreSignature();
+        $this->writeArrayInOutputFormat($input, $output, $result);
+        if (count($result)>0){
+            return 1;
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$result = $this->checker->verifyCoreSignature();
 		$this->writeArrayInOutputFormat($input, $output, $result);
-		if (count($result)>0){
+		if (count($result) > 0) {
 			return 1;
 		}
 	}

core/Command/User/LastSeen.php

Indentation +36 added lines, -36 removed lines

@@ -32,44 +32,44 @@
 use Symfony\Component\Console\Input\InputArgument;
 
 class LastSeen extends Command {
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     */
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('user:lastseen')
-			->setDescription('shows when the user was logged in last time')
-			->addArgument(
-				'uid',
-				InputArgument::REQUIRED,
-				'the username'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('user:lastseen')
+            ->setDescription('shows when the user was logged in last time')
+            ->addArgument(
+                'uid',
+                InputArgument::REQUIRED,
+                'the username'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$user = $this->userManager->get($input->getArgument('uid'));
-		if(is_null($user)) {
-			$output->writeln('<error>User does not exist</error>');
-			return;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $user = $this->userManager->get($input->getArgument('uid'));
+        if(is_null($user)) {
+            $output->writeln('<error>User does not exist</error>');
+            return;
+        }
 
-		$lastLogin = $user->getLastLogin();
-		if($lastLogin === 0) {
-			$output->writeln('User ' . $user->getUID() .
-				' has never logged in, yet.');
-		} else {
-			$date = new \DateTime();
-			$date->setTimestamp($lastLogin);
-			$output->writeln($user->getUID() .
-				'`s last login: ' . $date->format('d.m.Y H:i'));
-		}
-	}
+        $lastLogin = $user->getLastLogin();
+        if($lastLogin === 0) {
+            $output->writeln('User ' . $user->getUID() .
+                ' has never logged in, yet.');
+        } else {
+            $date = new \DateTime();
+            $date->setTimestamp($lastLogin);
+            $output->writeln($user->getUID() .
+                '`s last login: ' . $date->format('d.m.Y H:i'));
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -56,20 +56,20 @@
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$user = $this->userManager->get($input->getArgument('uid'));
-		if(is_null($user)) {
+		if (is_null($user)) {
 			$output->writeln('<error>User does not exist</error>');
 			return;
 		}
 
 		$lastLogin = $user->getLastLogin();
-		if($lastLogin === 0) {
-			$output->writeln('User ' . $user->getUID() .
+		if ($lastLogin === 0) {
+			$output->writeln('User '.$user->getUID().
 				' has never logged in, yet.');
 		} else {
 			$date = new \DateTime();
 			$date->setTimestamp($lastLogin);
-			$output->writeln($user->getUID() .
-				'`s last login: ' . $date->format('d.m.Y H:i'));
+			$output->writeln($user->getUID().
+				'`s last login: '.$date->format('d.m.Y H:i'));
 		}
 	}
 }

core/Command/User/ListCommand.php

Indentation +50 added lines, -50 removed lines

@@ -32,58 +32,58 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListCommand extends Base {
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     */
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('user:list')
-			->setDescription('list configured users')
-			->addOption(
-				'limit',
-				'l',
-				InputOption::VALUE_OPTIONAL,
-				'Number of users to retrieve',
-				500
-			)->addOption(
-				'offset',
-				'o',
-				InputOption::VALUE_OPTIONAL,
-				'Offset for retrieving users',
-				0
-			)->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('user:list')
+            ->setDescription('list configured users')
+            ->addOption(
+                'limit',
+                'l',
+                InputOption::VALUE_OPTIONAL,
+                'Number of users to retrieve',
+                500
+            )->addOption(
+                'offset',
+                'o',
+                InputOption::VALUE_OPTIONAL,
+                'Offset for retrieving users',
+                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) {
-		$users = $this->userManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
-		$this->writeArrayInOutputFormat($input, $output, $this->formatUsers($users));
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $users = $this->userManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
+        $this->writeArrayInOutputFormat($input, $output, $this->formatUsers($users));
+    }
 
-	/**
-	 * @param IUser[] $users
-	 * @return array
-	 */
-	private function formatUsers(array $users) {
-		$keys = array_map(function (IUser $user) {
-			return $user->getUID();
-		}, $users);
-		$values = array_map(function (IUser $user) {
-			return $user->getDisplayName();
-		}, $users);
-		return array_combine($keys, $values);
-	}
+    /**
+     * @param IUser[] $users
+     * @return array
+     */
+    private function formatUsers(array $users) {
+        $keys = array_map(function (IUser $user) {
+            return $user->getUID();
+        }, $users);
+        $values = array_map(function (IUser $user) {
+            return $user->getDisplayName();
+        }, $users);
+        return array_combine($keys, $values);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		$users = $this->userManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
+		$users = $this->userManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset'));
 		$this->writeArrayInOutputFormat($input, $output, $this->formatUsers($users));
 	}
 
@@ -78,10 +78,10 @@ 
 	 * @return array
 	 */
 	private function formatUsers(array $users) {
-		$keys = array_map(function (IUser $user) {
+		$keys = array_map(function(IUser $user) {
 			return $user->getUID();
 		}, $users);
-		$values = array_map(function (IUser $user) {
+		$values = array_map(function(IUser $user) {
 			return $user->getDisplayName();
 		}, $users);
 		return array_combine($keys, $values);

core/Command/User/Setting.php

Indentation +208 added lines, -208 removed lines

@@ -33,212 +33,212 @@
 use Symfony\Component\Console\Input\InputArgument;
 
 class Setting extends Base {
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/**
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IUserManager $userManager, IConfig $config, IDBConnection $connection) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->config = $config;
-		$this->connection = $connection;
-	}
-
-	protected function configure() {
-		parent::configure();
-		$this
-			->setName('user:setting')
-			->setDescription('Read and modify user settings')
-			->addArgument(
-				'uid',
-				InputArgument::REQUIRED,
-				'User ID used to login'
-			)
-			->addArgument(
-				'app',
-				InputArgument::OPTIONAL,
-				'Restrict the settings to a given app',
-				''
-			)
-			->addArgument(
-				'key',
-				InputArgument::OPTIONAL,
-				'Setting key to set, get or delete',
-				''
-			)
-			->addOption(
-				'ignore-missing-user',
-				null,
-				InputOption::VALUE_NONE,
-				'Use this option to ignore errors when the user does not exist'
-			)
-
-			// Get
-			->addOption(
-				'default-value',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'(Only applicable on get) If no default value is set and the config does not exist, the command will exit with 1'
-			)
-
-			// Set
-			->addArgument(
-				'value',
-				InputArgument::OPTIONAL,
-				'The new value of the setting',
-				null
-			)
-			->addOption(
-				'update-only',
-				null,
-				InputOption::VALUE_NONE,
-				'Only updates the value, if it is not set before, it is not being added'
-			)
-
-			// Delete
-			->addOption(
-				'delete',
-				null,
-				InputOption::VALUE_NONE,
-				'Specify this option to delete the config'
-			)
-			->addOption(
-				'error-if-not-exists',
-				null,
-				InputOption::VALUE_NONE,
-				'Checks whether the setting exists before deleting it'
-			)
-		;
-	}
-
-	protected function checkInput(InputInterface $input) {
-		$uid = $input->getArgument('uid');
-		if (!$input->getOption('ignore-missing-user') && !$this->userManager->userExists($uid)) {
-			throw new \InvalidArgumentException('The user "' . $uid . '" does not exists.');
-		}
-
-		if ($input->getArgument('key') === '' && $input->hasParameterOption('--default-value')) {
-			throw new \InvalidArgumentException('The "default-value" option can only be used when specifying a key.');
-		}
-
-		if ($input->getArgument('key') === '' && $input->getArgument('value') !== null) {
-			throw new \InvalidArgumentException('The value argument can only be used when specifying a key.');
-		}
-		if ($input->getArgument('value') !== null && $input->hasParameterOption('--default-value')) {
-			throw new \InvalidArgumentException('The value argument can not be used together with "default-value".');
-		}
-		if ($input->getOption('update-only') && $input->getArgument('value') === null) {
-			throw new \InvalidArgumentException('The "update-only" option can only be used together with "value".');
-		}
-
-		if ($input->getArgument('key') === '' && $input->getOption('delete')) {
-			throw new \InvalidArgumentException('The "delete" option can only be used when specifying a key.');
-		}
-		if ($input->getOption('delete') && $input->hasParameterOption('--default-value')) {
-			throw new \InvalidArgumentException('The "delete" option can not be used together with "default-value".');
-		}
-		if ($input->getOption('delete') && $input->getArgument('value') !== null) {
-			throw new \InvalidArgumentException('The "delete" option can not be used together with "value".');
-		}
-		if ($input->getOption('error-if-not-exists') && !$input->getOption('delete')) {
-			throw new \InvalidArgumentException('The "error-if-not-exists" option can only be used together with "delete".');
-		}
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		try {
-			$this->checkInput($input);
-		} catch (\InvalidArgumentException $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
-			return 1;
-		}
-
-		$uid = $input->getArgument('uid');
-		$app = $input->getArgument('app');
-		$key = $input->getArgument('key');
-
-		if ($key !== '') {
-			$value = $this->config->getUserValue($uid, $app, $key, null);
-			if ($input->getArgument('value') !== null) {
-				if ($input->hasParameterOption('--update-only') && $value === null) {
-					$output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>');
-					return 1;
-				}
-
-				if ($app === 'settings' && $key === 'email') {
-					$user = $this->userManager->get($uid);
-					if ($user instanceof IUser) {
-						$user->setEMailAddress($input->getArgument('value'));
-						return 0;
-					}
-				}
-
-				$this->config->setUserValue($uid, $app, $key, $input->getArgument('value'));
-				return 0;
-
-			} else if ($input->hasParameterOption('--delete')) {
-				if ($input->hasParameterOption('--error-if-not-exists') && $value === null) {
-					$output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>');
-					return 1;
-				}
-
-				if ($app === 'settings' && $key === 'email') {
-					$user = $this->userManager->get($uid);
-					if ($user instanceof IUser) {
-						$user->setEMailAddress('');
-						return 0;
-					}
-				}
-
-				$this->config->deleteUserValue($uid, $app, $key);
-				return 0;
-
-			} else if ($value !== null) {
-				$output->writeln($value);
-				return 0;
-			} else {
-				if ($input->hasParameterOption('--default-value')) {
-					$output->writeln($input->getOption('default-value'));
-					return 0;
-				} else {
-					$output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>');
-					return 1;
-				}
-			}
-		} else {
-			$settings = $this->getUserSettings($uid, $app);
-			$this->writeArrayInOutputFormat($input, $output, $settings);
-			return 0;
-		}
-	}
-
-	protected function getUserSettings($uid, $app) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('preferences')
-			->where($query->expr()->eq('userid', $query->createNamedParameter($uid)));
-
-		if ($app !== '') {
-			$query->andWhere($query->expr()->eq('appid', $query->createNamedParameter($app)));
-		}
-
-		$result = $query->execute();
-		$settings = [];
-		while ($row = $result->fetch()) {
-			$settings[$row['appid']][$row['configkey']] = $row['configvalue'];
-		}
-		$result->closeCursor();
-
-		return $settings;
-	}
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /**
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param IDBConnection $connection
+     */
+    public function __construct(IUserManager $userManager, IConfig $config, IDBConnection $connection) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->config = $config;
+        $this->connection = $connection;
+    }
+
+    protected function configure() {
+        parent::configure();
+        $this
+            ->setName('user:setting')
+            ->setDescription('Read and modify user settings')
+            ->addArgument(
+                'uid',
+                InputArgument::REQUIRED,
+                'User ID used to login'
+            )
+            ->addArgument(
+                'app',
+                InputArgument::OPTIONAL,
+                'Restrict the settings to a given app',
+                ''
+            )
+            ->addArgument(
+                'key',
+                InputArgument::OPTIONAL,
+                'Setting key to set, get or delete',
+                ''
+            )
+            ->addOption(
+                'ignore-missing-user',
+                null,
+                InputOption::VALUE_NONE,
+                'Use this option to ignore errors when the user does not exist'
+            )
+
+            // Get
+            ->addOption(
+                'default-value',
+                null,
+                InputOption::VALUE_REQUIRED,
+                '(Only applicable on get) If no default value is set and the config does not exist, the command will exit with 1'
+            )
+
+            // Set
+            ->addArgument(
+                'value',
+                InputArgument::OPTIONAL,
+                'The new value of the setting',
+                null
+            )
+            ->addOption(
+                'update-only',
+                null,
+                InputOption::VALUE_NONE,
+                'Only updates the value, if it is not set before, it is not being added'
+            )
+
+            // Delete
+            ->addOption(
+                'delete',
+                null,
+                InputOption::VALUE_NONE,
+                'Specify this option to delete the config'
+            )
+            ->addOption(
+                'error-if-not-exists',
+                null,
+                InputOption::VALUE_NONE,
+                'Checks whether the setting exists before deleting it'
+            )
+        ;
+    }
+
+    protected function checkInput(InputInterface $input) {
+        $uid = $input->getArgument('uid');
+        if (!$input->getOption('ignore-missing-user') && !$this->userManager->userExists($uid)) {
+            throw new \InvalidArgumentException('The user "' . $uid . '" does not exists.');
+        }
+
+        if ($input->getArgument('key') === '' && $input->hasParameterOption('--default-value')) {
+            throw new \InvalidArgumentException('The "default-value" option can only be used when specifying a key.');
+        }
+
+        if ($input->getArgument('key') === '' && $input->getArgument('value') !== null) {
+            throw new \InvalidArgumentException('The value argument can only be used when specifying a key.');
+        }
+        if ($input->getArgument('value') !== null && $input->hasParameterOption('--default-value')) {
+            throw new \InvalidArgumentException('The value argument can not be used together with "default-value".');
+        }
+        if ($input->getOption('update-only') && $input->getArgument('value') === null) {
+            throw new \InvalidArgumentException('The "update-only" option can only be used together with "value".');
+        }
+
+        if ($input->getArgument('key') === '' && $input->getOption('delete')) {
+            throw new \InvalidArgumentException('The "delete" option can only be used when specifying a key.');
+        }
+        if ($input->getOption('delete') && $input->hasParameterOption('--default-value')) {
+            throw new \InvalidArgumentException('The "delete" option can not be used together with "default-value".');
+        }
+        if ($input->getOption('delete') && $input->getArgument('value') !== null) {
+            throw new \InvalidArgumentException('The "delete" option can not be used together with "value".');
+        }
+        if ($input->getOption('error-if-not-exists') && !$input->getOption('delete')) {
+            throw new \InvalidArgumentException('The "error-if-not-exists" option can only be used together with "delete".');
+        }
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        try {
+            $this->checkInput($input);
+        } catch (\InvalidArgumentException $e) {
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            return 1;
+        }
+
+        $uid = $input->getArgument('uid');
+        $app = $input->getArgument('app');
+        $key = $input->getArgument('key');
+
+        if ($key !== '') {
+            $value = $this->config->getUserValue($uid, $app, $key, null);
+            if ($input->getArgument('value') !== null) {
+                if ($input->hasParameterOption('--update-only') && $value === null) {
+                    $output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>');
+                    return 1;
+                }
+
+                if ($app === 'settings' && $key === 'email') {
+                    $user = $this->userManager->get($uid);
+                    if ($user instanceof IUser) {
+                        $user->setEMailAddress($input->getArgument('value'));
+                        return 0;
+                    }
+                }
+
+                $this->config->setUserValue($uid, $app, $key, $input->getArgument('value'));
+                return 0;
+
+            } else if ($input->hasParameterOption('--delete')) {
+                if ($input->hasParameterOption('--error-if-not-exists') && $value === null) {
+                    $output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>');
+                    return 1;
+                }
+
+                if ($app === 'settings' && $key === 'email') {
+                    $user = $this->userManager->get($uid);
+                    if ($user instanceof IUser) {
+                        $user->setEMailAddress('');
+                        return 0;
+                    }
+                }
+
+                $this->config->deleteUserValue($uid, $app, $key);
+                return 0;
+
+            } else if ($value !== null) {
+                $output->writeln($value);
+                return 0;
+            } else {
+                if ($input->hasParameterOption('--default-value')) {
+                    $output->writeln($input->getOption('default-value'));
+                    return 0;
+                } else {
+                    $output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>');
+                    return 1;
+                }
+            }
+        } else {
+            $settings = $this->getUserSettings($uid, $app);
+            $this->writeArrayInOutputFormat($input, $output, $settings);
+            return 0;
+        }
+    }
+
+    protected function getUserSettings($uid, $app) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('preferences')
+            ->where($query->expr()->eq('userid', $query->createNamedParameter($uid)));
+
+        if ($app !== '') {
+            $query->andWhere($query->expr()->eq('appid', $query->createNamedParameter($app)));
+        }
+
+        $result = $query->execute();
+        $settings = [];
+        while ($row = $result->fetch()) {
+            $settings[$row['appid']][$row['configkey']] = $row['configvalue'];
+        }
+        $result->closeCursor();
+
+        return $settings;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -124,7 +124,7 @@ 
 	protected function checkInput(InputInterface $input) {
 		$uid = $input->getArgument('uid');
 		if (!$input->getOption('ignore-missing-user') && !$this->userManager->userExists($uid)) {
-			throw new \InvalidArgumentException('The user "' . $uid . '" does not exists.');
+			throw new \InvalidArgumentException('The user "'.$uid.'" does not exists.');
 		}
 
 		if ($input->getArgument('key') === '' && $input->hasParameterOption('--default-value')) {
@@ -159,7 +159,7 @@ 
 		try {
 			$this->checkInput($input);
 		} catch (\InvalidArgumentException $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 			return 1;
 		}
 
@@ -171,7 +171,7 @@ 
 			$value = $this->config->getUserValue($uid, $app, $key, null);
 			if ($input->getArgument('value') !== null) {
 				if ($input->hasParameterOption('--update-only') && $value === null) {
-					$output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>');
+					$output->writeln('<error>The setting does not exist for user "'.$uid.'".</error>');
 					return 1;
 				}
 
@@ -188,7 +188,7 @@ 
 
 			} else if ($input->hasParameterOption('--delete')) {
 				if ($input->hasParameterOption('--error-if-not-exists') && $value === null) {
-					$output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>');
+					$output->writeln('<error>The setting does not exist for user "'.$uid.'".</error>');
 					return 1;
 				}
 
@@ -211,7 +211,7 @@ 
 					$output->writeln($input->getOption('default-value'));
 					return 0;
 				} else {
-					$output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>');
+					$output->writeln('<error>The setting does not exist for user "'.$uid.'".</error>');
 					return 1;
 				}
 			}

core/Command/User/Enable.php

Indentation +28 added lines, -28 removed lines

@@ -30,36 +30,36 @@
 use Symfony\Component\Console\Input\InputArgument;
 
 class Enable extends Command {
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     */
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('user:enable')
-			->setDescription('enables the specified user')
-			->addArgument(
-				'uid',
-				InputArgument::REQUIRED,
-				'the username'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('user:enable')
+            ->setDescription('enables the specified user')
+            ->addArgument(
+                'uid',
+                InputArgument::REQUIRED,
+                'the username'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$user = $this->userManager->get($input->getArgument('uid'));
-		if (is_null($user)) {
-			$output->writeln('<error>User does not exist</error>');
-			return;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $user = $this->userManager->get($input->getArgument('uid'));
+        if (is_null($user)) {
+            $output->writeln('<error>User does not exist</error>');
+            return;
+        }
 
-		$user->setEnabled(true);
-		$output->writeln('<info>The specified user is enabled</info>');
-	}
+        $user->setEnabled(true);
+        $output->writeln('<info>The specified user is enabled</info>');
+    }
 }

core/Command/User/Disable.php

Indentation +28 added lines, -28 removed lines

@@ -30,36 +30,36 @@
 use Symfony\Component\Console\Input\InputArgument;
 
 class Disable extends Command {
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     */
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('user:disable')
-			->setDescription('disables the specified user')
-			->addArgument(
-				'uid',
-				InputArgument::REQUIRED,
-				'the username'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('user:disable')
+            ->setDescription('disables the specified user')
+            ->addArgument(
+                'uid',
+                InputArgument::REQUIRED,
+                'the username'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$user = $this->userManager->get($input->getArgument('uid'));
-		if (is_null($user)) {
-			$output->writeln('<error>User does not exist</error>');
-			return;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $user = $this->userManager->get($input->getArgument('uid'));
+        if (is_null($user)) {
+            $output->writeln('<error>User does not exist</error>');
+            return;
+        }
 
-		$user->setEnabled(false);
-		$output->writeln('<info>The specified user is disabled</info>');
-	}
+        $user->setEnabled(false);
+        $output->writeln('<info>The specified user is disabled</info>');
+    }
 }

core/Command/User/ResetPassword.php

Spacing +2 added lines, -2 removed lines

@@ -117,12 +117,12 @@
 		try {
 			$success = $user->setPassword($password);
 		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 			return 1;
 		}
 
 		if ($success) {
-			$output->writeln("<info>Successfully reset password for " . $username . "</info>");
+			$output->writeln("<info>Successfully reset password for ".$username."</info>");
 		} else {
 			$output->writeln("<error>Error while resetting password!</error>");
 			return 1;

Indentation +94 added lines, -94 removed lines

@@ -39,98 +39,98 @@
 
 class ResetPassword extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
-
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('user:resetpassword')
-			->setDescription('Resets the password of the named user')
-			->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'Username to reset password'
-			)
-			->addOption(
-				'password-from-env',
-				null,
-				InputOption::VALUE_NONE,
-				'read password from environment variable OC_PASS'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$username = $input->getArgument('user');
-
-		/** @var $user \OCP\IUser */
-		$user = $this->userManager->get($username);
-		if (is_null($user)) {
-			$output->writeln('<error>User does not exist</error>');
-			return 1;
-		}
-
-		if ($input->getOption('password-from-env')) {
-			$password = getenv('OC_PASS');
-			if (!$password) {
-				$output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
-				return 1;
-			}
-		} elseif ($input->isInteractive()) {
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-
-			if (\OCP\App::isEnabled('encryption')) {
-				$output->writeln(
-					'<error>Warning: Resetting the password when using encryption will result in data loss!</error>'
-				);
-
-				$question = new ConfirmationQuestion('Do you want to continue?');
-				if (!$helper->ask($input, $output, $question)) {
-					return 1;
-				}
-			}
-
-			$question = new Question('Enter a new password: ');
-			$question->setHidden(true);
-			$password = $helper->ask($input, $output, $question);
-
-			if ($password === null) {
-				$output->writeln("<error>Password cannot be empty!</error>");
-				return 1;
-			}
-
-			$question = new Question('Confirm the new password: ');
-			$question->setHidden(true);
-			$confirm = $helper->ask($input, $output, $question);
-
-			if ($password !== $confirm) {
-				$output->writeln("<error>Passwords did not match!</error>");
-				return 1;
-			}
-		} else {
-			$output->writeln("<error>Interactive input or --password-from-env is needed for entering a new password!</error>");
-			return 1;
-		}
-
-
-		try {
-			$success = $user->setPassword($password);
-		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
-			return 1;
-		}
-
-		if ($success) {
-			$output->writeln("<info>Successfully reset password for " . $username . "</info>");
-		} else {
-			$output->writeln("<error>Error while resetting password!</error>");
-			return 1;
-		}
-	}
+    /** @var IUserManager */
+    protected $userManager;
+
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('user:resetpassword')
+            ->setDescription('Resets the password of the named user')
+            ->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'Username to reset password'
+            )
+            ->addOption(
+                'password-from-env',
+                null,
+                InputOption::VALUE_NONE,
+                'read password from environment variable OC_PASS'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $username = $input->getArgument('user');
+
+        /** @var $user \OCP\IUser */
+        $user = $this->userManager->get($username);
+        if (is_null($user)) {
+            $output->writeln('<error>User does not exist</error>');
+            return 1;
+        }
+
+        if ($input->getOption('password-from-env')) {
+            $password = getenv('OC_PASS');
+            if (!$password) {
+                $output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
+                return 1;
+            }
+        } elseif ($input->isInteractive()) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+
+            if (\OCP\App::isEnabled('encryption')) {
+                $output->writeln(
+                    '<error>Warning: Resetting the password when using encryption will result in data loss!</error>'
+                );
+
+                $question = new ConfirmationQuestion('Do you want to continue?');
+                if (!$helper->ask($input, $output, $question)) {
+                    return 1;
+                }
+            }
+
+            $question = new Question('Enter a new password: ');
+            $question->setHidden(true);
+            $password = $helper->ask($input, $output, $question);
+
+            if ($password === null) {
+                $output->writeln("<error>Password cannot be empty!</error>");
+                return 1;
+            }
+
+            $question = new Question('Confirm the new password: ');
+            $question->setHidden(true);
+            $confirm = $helper->ask($input, $output, $question);
+
+            if ($password !== $confirm) {
+                $output->writeln("<error>Passwords did not match!</error>");
+                return 1;
+            }
+        } else {
+            $output->writeln("<error>Interactive input or --password-from-env is needed for entering a new password!</error>");
+            return 1;
+        }
+
+
+        try {
+            $success = $user->setPassword($password);
+        } catch (\Exception $e) {
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            return 1;
+        }
+
+        if ($success) {
+            $output->writeln("<info>Successfully reset password for " . $username . "</info>");
+        } else {
+            $output->writeln("<error>Error while resetting password!</error>");
+            return 1;
+        }
+    }
 }

core/Command/User/Add.php

Indentation +121 added lines, -121 removed lines

@@ -36,125 +36,125 @@
 use Symfony\Component\Console\Question\Question;
 
 class Add extends Command {
-	/** @var \OCP\IUserManager */
-	protected $userManager;
-
-	/** @var \OCP\IGroupManager */
-	protected $groupManager;
-
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-	}
-
-	protected function configure() {
-		$this
-			->setName('user:add')
-			->setDescription('adds a user')
-			->addArgument(
-				'uid',
-				InputArgument::REQUIRED,
-				'User ID used to login (must only contain a-z, A-Z, 0-9, -, _ and @)'
-			)
-			->addOption(
-				'password-from-env',
-				null,
-				InputOption::VALUE_NONE,
-				'read password from environment variable OC_PASS'
-			)
-			->addOption(
-				'display-name',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'User name used in the web UI (can contain any characters)'
-			)
-			->addOption(
-				'group',
-				'g',
-				InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
-				'groups the user should be added to (The group will be created if it does not exist)'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$uid = $input->getArgument('uid');
-		if ($this->userManager->userExists($uid)) {
-			$output->writeln('<error>The user "' . $uid . '" already exists.</error>');
-			return 1;
-		}
-
-		if ($input->getOption('password-from-env')) {
-			$password = getenv('OC_PASS');
-			if (!$password) {
-				$output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
-				return 1;
-			}
-		} elseif ($input->isInteractive()) {
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-
-			$question = new Question('Enter password: ');
-			$question->setHidden(true);
-			$password = $helper->ask($input, $output, $question);
-
-			$question = new Question('Confirm password: ');
-			$question->setHidden(true);
-			$confirm = $helper->ask($input, $output,$question);
-
-			if ($password !== $confirm) {
-				$output->writeln("<error>Passwords did not match!</error>");
-				return 1;
-			}
-		} else {
-			$output->writeln("<error>Interactive input or --password-from-env is needed for entering a password!</error>");
-			return 1;
-		}
-
-		try {
-			$user = $this->userManager->createUser(
-				$input->getArgument('uid'),
-				$password
-			);
-		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
-			return 1;
-		}
-
-
-		if ($user instanceof IUser) {
-			$output->writeln('<info>The user "' . $user->getUID() . '" was created successfully</info>');
-		} else {
-			$output->writeln('<error>An error occurred while creating the user</error>');
-			return 1;
-		}
-
-		if ($input->getOption('display-name')) {
-			$user->setDisplayName($input->getOption('display-name'));
-			$output->writeln('Display name set to "' . $user->getDisplayName() . '"');
-		}
-
-		$groups = $input->getOption('group');
-
-		if (!empty($groups)) {
-			// Make sure we init the Filesystem for the user, in case we need to
-			// init some group shares.
-			Filesystem::init($user->getUID(), '');
-		}
-
-		foreach ($groups as $groupName) {
-			$group = $this->groupManager->get($groupName);
-			if (!$group) {
-				$this->groupManager->createGroup($groupName);
-				$group = $this->groupManager->get($groupName);
-				$output->writeln('Created group "' . $group->getGID() . '"');
-			}
-			$group->addUser($user);
-			$output->writeln('User "' . $user->getUID() . '" added to group "' . $group->getGID() . '"');
-		}
-	}
+    /** @var \OCP\IUserManager */
+    protected $userManager;
+
+    /** @var \OCP\IGroupManager */
+    protected $groupManager;
+
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('user:add')
+            ->setDescription('adds a user')
+            ->addArgument(
+                'uid',
+                InputArgument::REQUIRED,
+                'User ID used to login (must only contain a-z, A-Z, 0-9, -, _ and @)'
+            )
+            ->addOption(
+                'password-from-env',
+                null,
+                InputOption::VALUE_NONE,
+                'read password from environment variable OC_PASS'
+            )
+            ->addOption(
+                'display-name',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'User name used in the web UI (can contain any characters)'
+            )
+            ->addOption(
+                'group',
+                'g',
+                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+                'groups the user should be added to (The group will be created if it does not exist)'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $uid = $input->getArgument('uid');
+        if ($this->userManager->userExists($uid)) {
+            $output->writeln('<error>The user "' . $uid . '" already exists.</error>');
+            return 1;
+        }
+
+        if ($input->getOption('password-from-env')) {
+            $password = getenv('OC_PASS');
+            if (!$password) {
+                $output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
+                return 1;
+            }
+        } elseif ($input->isInteractive()) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+
+            $question = new Question('Enter password: ');
+            $question->setHidden(true);
+            $password = $helper->ask($input, $output, $question);
+
+            $question = new Question('Confirm password: ');
+            $question->setHidden(true);
+            $confirm = $helper->ask($input, $output,$question);
+
+            if ($password !== $confirm) {
+                $output->writeln("<error>Passwords did not match!</error>");
+                return 1;
+            }
+        } else {
+            $output->writeln("<error>Interactive input or --password-from-env is needed for entering a password!</error>");
+            return 1;
+        }
+
+        try {
+            $user = $this->userManager->createUser(
+                $input->getArgument('uid'),
+                $password
+            );
+        } catch (\Exception $e) {
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            return 1;
+        }
+
+
+        if ($user instanceof IUser) {
+            $output->writeln('<info>The user "' . $user->getUID() . '" was created successfully</info>');
+        } else {
+            $output->writeln('<error>An error occurred while creating the user</error>');
+            return 1;
+        }
+
+        if ($input->getOption('display-name')) {
+            $user->setDisplayName($input->getOption('display-name'));
+            $output->writeln('Display name set to "' . $user->getDisplayName() . '"');
+        }
+
+        $groups = $input->getOption('group');
+
+        if (!empty($groups)) {
+            // Make sure we init the Filesystem for the user, in case we need to
+            // init some group shares.
+            Filesystem::init($user->getUID(), '');
+        }
+
+        foreach ($groups as $groupName) {
+            $group = $this->groupManager->get($groupName);
+            if (!$group) {
+                $this->groupManager->createGroup($groupName);
+                $group = $this->groupManager->get($groupName);
+                $output->writeln('Created group "' . $group->getGID() . '"');
+            }
+            $group->addUser($user);
+            $output->writeln('User "' . $user->getUID() . '" added to group "' . $group->getGID() . '"');
+        }
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -84,7 +84,7 @@ 
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$uid = $input->getArgument('uid');
 		if ($this->userManager->userExists($uid)) {
-			$output->writeln('<error>The user "' . $uid . '" already exists.</error>');
+			$output->writeln('<error>The user "'.$uid.'" already exists.</error>');
 			return 1;
 		}
 
@@ -104,7 +104,7 @@ 
 
 			$question = new Question('Confirm password: ');
 			$question->setHidden(true);
-			$confirm = $helper->ask($input, $output,$question);
+			$confirm = $helper->ask($input, $output, $question);
 
 			if ($password !== $confirm) {
 				$output->writeln("<error>Passwords did not match!</error>");
@@ -121,13 +121,13 @@ 
 				$password
 			);
 		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 			return 1;
 		}
 
 
 		if ($user instanceof IUser) {
-			$output->writeln('<info>The user "' . $user->getUID() . '" was created successfully</info>');
+			$output->writeln('<info>The user "'.$user->getUID().'" was created successfully</info>');
 		} else {
 			$output->writeln('<error>An error occurred while creating the user</error>');
 			return 1;
@@ -135,7 +135,7 @@ 
 
 		if ($input->getOption('display-name')) {
 			$user->setDisplayName($input->getOption('display-name'));
-			$output->writeln('Display name set to "' . $user->getDisplayName() . '"');
+			$output->writeln('Display name set to "'.$user->getDisplayName().'"');
 		}
 
 		$groups = $input->getOption('group');
@@ -151,10 +151,10 @@ 
 			if (!$group) {
 				$this->groupManager->createGroup($groupName);
 				$group = $this->groupManager->get($groupName);
-				$output->writeln('Created group "' . $group->getGID() . '"');
+				$output->writeln('Created group "'.$group->getGID().'"');
 			}
 			$group->addUser($user);
-			$output->writeln('User "' . $user->getUID() . '" added to group "' . $group->getGID() . '"');
+			$output->writeln('User "'.$user->getUID().'" added to group "'.$group->getGID().'"');
 		}
 	}
 }

core/Command/User/Report.php

Indentation +44 added lines, -44 removed lines

@@ -32,56 +32,56 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Report extends Command {
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     */
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('user:report')
-			->setDescription('shows how many users have access');
-	}
+    protected function configure() {
+        $this
+            ->setName('user:report')
+            ->setDescription('shows how many users have access');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$table = new Table($output);
-		$table->setHeaders(array('User Report', ''));
-		$userCountArray = $this->countUsers();
-		if(!empty($userCountArray)) {
-			$total = 0;
-			$rows = array();
-			foreach($userCountArray as $classname => $users) {
-				$total += $users;
-				$rows[] = array($classname, $users);
-			}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $table = new Table($output);
+        $table->setHeaders(array('User Report', ''));
+        $userCountArray = $this->countUsers();
+        if(!empty($userCountArray)) {
+            $total = 0;
+            $rows = array();
+            foreach($userCountArray as $classname => $users) {
+                $total += $users;
+                $rows[] = array($classname, $users);
+            }
 
-			$rows[] = array(' ');
-			$rows[] = array('total users', $total);
-		} else {
-			$rows[] = array('No backend enabled that supports user counting', '');
-		}
+            $rows[] = array(' ');
+            $rows[] = array('total users', $total);
+        } else {
+            $rows[] = array('No backend enabled that supports user counting', '');
+        }
 
-		$userDirectoryCount = $this->countUserDirectories();
-		$rows[] = array(' ');
-		$rows[] = array('user directories', $userDirectoryCount);
+        $userDirectoryCount = $this->countUserDirectories();
+        $rows[] = array(' ');
+        $rows[] = array('user directories', $userDirectoryCount);
 
-		$table->setRows($rows);
-		$table->render();
-	}
+        $table->setRows($rows);
+        $table->render();
+    }
 
-	private function countUsers() {
-		return $this->userManager->countUsers();
-	}
+    private function countUsers() {
+        return $this->userManager->countUsers();
+    }
 
-	private function countUserDirectories() {
-		$dataview = new \OC\Files\View('/');
-		$userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
-		return count($userDirectories);
-	}
+    private function countUserDirectories() {
+        $dataview = new \OC\Files\View('/');
+        $userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
+        return count($userDirectories);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -53,10 +53,10 @@
 		$table = new Table($output);
 		$table->setHeaders(array('User Report', ''));
 		$userCountArray = $this->countUsers();
-		if(!empty($userCountArray)) {
+		if (!empty($userCountArray)) {
 			$total = 0;
 			$rows = array();
-			foreach($userCountArray as $classname => $users) {
+			foreach ($userCountArray as $classname => $users) {
 				$total += $users;
 				$rows[] = array($classname, $users);
 			}