nextcloud / server

core/Command/Maintenance/DataFingerprint.php

Indentation +19 added lines, -19 removed lines

@@ -30,26 +30,26 @@
 
 class DataFingerprint extends Command {
 
-	/** @var IConfig */
-	protected $config;
-	/** @var ITimeFactory */
-	protected $timeFactory;
+    /** @var IConfig */
+    protected $config;
+    /** @var ITimeFactory */
+    protected $timeFactory;
 
-	public function __construct(IConfig $config,
-								ITimeFactory $timeFactory) {
-		$this->config = $config;
-		$this->timeFactory = $timeFactory;
-		parent::__construct();
-	}
+    public function __construct(IConfig $config,
+                                ITimeFactory $timeFactory) {
+        $this->config = $config;
+        $this->timeFactory = $timeFactory;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('maintenance:data-fingerprint')
-			->setDescription('update the systems data-fingerprint after a backup is restored');
-	}
+    protected function configure() {
+        $this
+            ->setName('maintenance:data-fingerprint')
+            ->setDescription('update the systems data-fingerprint after a backup is restored');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$this->config->setSystemValue('data-fingerprint', md5($this->timeFactory->getTime()));
-		return 0;
-	}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $this->config->setSystemValue('data-fingerprint', md5($this->timeFactory->getTime()));
+        return 0;
+    }
 }

core/Command/Maintenance/UpdateHtaccess.php

Indentation +14 added lines, -14 removed lines

@@ -30,19 +30,19 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class UpdateHtaccess extends Command {
-	protected function configure() {
-		$this
-			->setName('maintenance:update:htaccess')
-			->setDescription('Updates the .htaccess file');
-	}
+    protected function configure() {
+        $this
+            ->setName('maintenance:update:htaccess')
+            ->setDescription('Updates the .htaccess file');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		if (\OC\Setup::updateHtaccess()) {
-			$output->writeln('.htaccess has been updated');
-			return 0;
-		} else {
-			$output->writeln('<error>Error updating .htaccess file, not enough permissions or "overwrite.cli.url" set to an invalid URL?</error>');
-			return 1;
-		}
-	}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        if (\OC\Setup::updateHtaccess()) {
+            $output->writeln('.htaccess has been updated');
+            return 0;
+        } else {
+            $output->writeln('<error>Error updating .htaccess file, not enough permissions or "overwrite.cli.url" set to an invalid URL?</error>');
+            return 1;
+        }
+    }
 }

core/Command/User/Disable.php

Indentation +29 added lines, -29 removed lines

@@ -30,37 +30,37 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 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): int {
-		$user = $this->userManager->get($input->getArgument('uid'));
-		if (is_null($user)) {
-			$output->writeln('<error>User does not exist</error>');
-			return 1;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $this->userManager->get($input->getArgument('uid'));
+        if (is_null($user)) {
+            $output->writeln('<error>User does not exist</error>');
+            return 1;
+        }
 
-		$user->setEnabled(false);
-		$output->writeln('<info>The specified user is disabled</info>');
-		return 0;
-	}
+        $user->setEnabled(false);
+        $output->writeln('<info>The specified user is disabled</info>');
+        return 0;
+    }
 }

core/Command/User/Delete.php

Indentation +32 added lines, -32 removed lines

@@ -33,41 +33,41 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Delete 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:delete')
-			->setDescription('deletes the specified user')
-			->addArgument(
-				'uid',
-				InputArgument::REQUIRED,
-				'the username'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('user:delete')
+            ->setDescription('deletes the specified user')
+            ->addArgument(
+                'uid',
+                InputArgument::REQUIRED,
+                'the username'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$user = $this->userManager->get($input->getArgument('uid'));
-		if (is_null($user)) {
-			$output->writeln('<error>User does not exist</error>');
-			return 0;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $this->userManager->get($input->getArgument('uid'));
+        if (is_null($user)) {
+            $output->writeln('<error>User does not exist</error>');
+            return 0;
+        }
 
-		if ($user->delete()) {
-			$output->writeln('<info>The specified user was deleted</info>');
-			return 0;
-		}
+        if ($user->delete()) {
+            $output->writeln('<info>The specified user was deleted</info>');
+            return 0;
+        }
 
-		$output->writeln('<error>The specified user could not be deleted. Please check the logs.</error>');
-		return 1;
-	}
+        $output->writeln('<error>The specified user could not be deleted. Please check the logs.</error>');
+        return 1;
+    }
 }

core/Command/User/ListCommand.php

Indentation +77 added lines, -77 removed lines

@@ -34,88 +34,88 @@
 
 class ListCommand extends Base {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var IGroupManager */
-	protected $groupManager;
+    /** @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('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
-			)->addOption(
-				'info',
-				'i',
-				InputOption::VALUE_NONE,
-				'Show detailed info'
-			);
-	}
+    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
+            )->addOption(
+                'info',
+                'i',
+                InputOption::VALUE_NONE,
+                'Show detailed info'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$users = $this->userManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset'));
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $users = $this->userManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset'));
 
-		$this->writeArrayInOutputFormat($input, $output, $this->formatUsers($users, (bool)$input->getOption('info')));
-		return 0;
-	}
+        $this->writeArrayInOutputFormat($input, $output, $this->formatUsers($users, (bool)$input->getOption('info')));
+        return 0;
+    }
 
-	/**
-	 * @param IUser[] $users
-	 * @param bool [$detailed=false]
-	 * @return array
-	 */
-	private function formatUsers(array $users, bool $detailed = false) {
-		$keys = array_map(function (IUser $user) {
-			return $user->getUID();
-		}, $users);
+    /**
+     * @param IUser[] $users
+     * @param bool [$detailed=false]
+     * @return array
+     */
+    private function formatUsers(array $users, bool $detailed = false) {
+        $keys = array_map(function (IUser $user) {
+            return $user->getUID();
+        }, $users);
 
-		$values = array_map(function (IUser $user) use ($detailed) {
-			if ($detailed) {
-				$groups = $this->groupManager->getUserGroupIds($user);
-				return [
-					'user_id' => $user->getUID(),
-					'display_name' => $user->getDisplayName(),
-					'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '',
-					'cloud_id' => $user->getCloudId(),
-					'enabled' => $user->isEnabled(),
-					'groups' => $groups,
-					'quota' => $user->getQuota(),
-					'last_seen' => date(\DateTime::ATOM, $user->getLastLogin()), // ISO-8601
-					'user_directory' => $user->getHome(),
-					'backend' => $user->getBackendClassName()
-				];
-			}
-			return $user->getDisplayName();
-		}, $users);
-		return array_combine($keys, $values);
-	}
+        $values = array_map(function (IUser $user) use ($detailed) {
+            if ($detailed) {
+                $groups = $this->groupManager->getUserGroupIds($user);
+                return [
+                    'user_id' => $user->getUID(),
+                    'display_name' => $user->getDisplayName(),
+                    'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '',
+                    'cloud_id' => $user->getCloudId(),
+                    'enabled' => $user->isEnabled(),
+                    'groups' => $groups,
+                    'quota' => $user->getQuota(),
+                    'last_seen' => date(\DateTime::ATOM, $user->getLastLogin()), // ISO-8601
+                    'user_directory' => $user->getHome(),
+                    'backend' => $user->getBackendClassName()
+                ];
+            }
+            return $user->getDisplayName();
+        }, $users);
+        return array_combine($keys, $values);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -84,7 +84,7 @@ 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$users = $this->userManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset'));
 
-		$this->writeArrayInOutputFormat($input, $output, $this->formatUsers($users, (bool)$input->getOption('info')));
+		$this->writeArrayInOutputFormat($input, $output, $this->formatUsers($users, (bool) $input->getOption('info')));
 		return 0;
 	}
 
@@ -94,11 +94,11 @@ 
 	 * @return array
 	 */
 	private function formatUsers(array $users, bool $detailed = false) {
-		$keys = array_map(function (IUser $user) {
+		$keys = array_map(function(IUser $user) {
 			return $user->getUID();
 		}, $users);
 
-		$values = array_map(function (IUser $user) use ($detailed) {
+		$values = array_map(function(IUser $user) use ($detailed) {
 			if ($detailed) {
 				$groups = $this->groupManager->getUserGroupIds($user);
 				return [

core/Command/User/LastSeen.php

Indentation +37 added lines, -37 removed lines

@@ -34,45 +34,45 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 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): int {
-		$user = $this->userManager->get($input->getArgument('uid'));
-		if (is_null($user)) {
-			$output->writeln('<error>User does not exist</error>');
-			return 1;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $this->userManager->get($input->getArgument('uid'));
+        if (is_null($user)) {
+            $output->writeln('<error>User does not exist</error>');
+            return 1;
+        }
 
-		$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'));
-		}
-		return 0;
-	}
+        $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'));
+        }
+        return 0;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -65,13 +65,13 @@
 
 		$lastLogin = $user->getLastLogin();
 		if ($lastLogin === 0) {
-			$output->writeln('User ' . $user->getUID() .
+			$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'));
 		}
 		return 0;
 	}

core/Command/User/Setting.php

Indentation +206 added lines, -206 removed lines

@@ -36,210 +36,210 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 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 exist.');
-		}
-
-		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): int {
-		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;
-			} elseif ($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;
-			} elseif ($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 exist.');
+        }
+
+        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): int {
+        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;
+            } elseif ($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;
+            } elseif ($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;
+    }
 }

core/Command/User/Add.php

Indentation +126 added lines, -126 removed lines

@@ -40,130 +40,130 @@
 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): int {
-		$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);
-				if ($group instanceof IGroup) {
-					$output->writeln('Created group "' . $group->getGID() . '"');
-				}
-			}
-			if ($group instanceof IGroup) {
-				$group->addUser($user);
-				$output->writeln('User "' . $user->getUID() . '" added to group "' . $group->getGID() . '"');
-			}
-		}
-		return 0;
-	}
+    /** @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): int {
+        $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);
+                if ($group instanceof IGroup) {
+                    $output->writeln('Created group "' . $group->getGID() . '"');
+                }
+            }
+            if ($group instanceof IGroup) {
+                $group->addUser($user);
+                $output->writeln('User "' . $user->getUID() . '" added to group "' . $group->getGID() . '"');
+            }
+        }
+        return 0;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -88,7 +88,7 @@ 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$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;
 		}
 
@@ -108,7 +108,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>");
@@ -125,13 +125,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;
@@ -139,7 +139,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');
@@ -156,12 +156,12 @@ 
 				$this->groupManager->createGroup($groupName);
 				$group = $this->groupManager->get($groupName);
 				if ($group instanceof IGroup) {
-					$output->writeln('Created group "' . $group->getGID() . '"');
+					$output->writeln('Created group "'.$group->getGID().'"');
 				}
 			}
 			if ($group instanceof IGroup) {
 				$group->addUser($user);
-				$output->writeln('User "' . $user->getUID() . '" added to group "' . $group->getGID() . '"');
+				$output->writeln('User "'.$user->getUID().'" added to group "'.$group->getGID().'"');
 			}
 		}
 		return 0;

core/Command/User/Info.php

Indentation +51 added lines, -51 removed lines

@@ -33,58 +33,58 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Info 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('user:info')
-			->setDescription('show user info')
-			->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'user to show'
-			)->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('user:info')
+            ->setDescription('show user info')
+            ->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'user to show'
+            )->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): int {
-		$user = $this->userManager->get($input->getArgument('user'));
-		if (is_null($user)) {
-			$output->writeln('<error>user not found</error>');
-			return 1;
-		}
-		$groups = $this->groupManager->getUserGroupIds($user);
-		$data = [
-			'user_id' => $user->getUID(),
-			'display_name' => $user->getDisplayName(),
-			'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '',
-			'cloud_id' => $user->getCloudId(),
-			'enabled' => $user->isEnabled(),
-			'groups' => $groups,
-			'quota' => $user->getQuota(),
-			'last_seen' => date(\DateTime::ATOM, $user->getLastLogin()), // ISO-8601
-			'user_directory' => $user->getHome(),
-			'backend' => $user->getBackendClassName()
-		];
-		$this->writeArrayInOutputFormat($input, $output, $data);
-		return 0;
-	}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $this->userManager->get($input->getArgument('user'));
+        if (is_null($user)) {
+            $output->writeln('<error>user not found</error>');
+            return 1;
+        }
+        $groups = $this->groupManager->getUserGroupIds($user);
+        $data = [
+            'user_id' => $user->getUID(),
+            'display_name' => $user->getDisplayName(),
+            'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '',
+            'cloud_id' => $user->getCloudId(),
+            'enabled' => $user->isEnabled(),
+            'groups' => $groups,
+            'quota' => $user->getQuota(),
+            'last_seen' => date(\DateTime::ATOM, $user->getLastLogin()), // ISO-8601
+            'user_directory' => $user->getHome(),
+            'backend' => $user->getBackendClassName()
+        ];
+        $this->writeArrayInOutputFormat($input, $output, $data);
+        return 0;
+    }
 }