nextcloud / server

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

core/Command/User/Delete.php

Indentation +31 added lines, -31 removed lines

@@ -32,40 +32,40 @@
 use Symfony\Component\Console\Input\InputArgument;
 
 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) {
-		$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;
+        }
 
-		if ($user->delete()) {
-			$output->writeln('<info>The specified user was deleted</info>');
-			return;
-		}
+        if ($user->delete()) {
+            $output->writeln('<info>The specified user was deleted</info>');
+            return;
+        }
 
-		$output->writeln('<error>The specified user could not be deleted. Please check the logs.</error>');
-	}
+        $output->writeln('<error>The specified user could not be deleted. Please check the logs.</error>');
+    }
 }

core/Command/Background/WebCron.php

Indentation +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@
 
 class WebCron extends Base {
 
-	protected function getMode() {
-		return 'webcron';
-	}
+    protected function getMode() {
+        return 'webcron';
+    }
 }

core/Command/Background/Base.php

Indentation +31 added lines, -31 removed lines

@@ -39,39 +39,39 @@
 abstract class Base extends Command {
 
 
-	abstract protected function getMode();
+    abstract protected function getMode();
 
-	/**
-	* @var \OCP\IConfig
-	*/
-	protected $config;
+    /**
+     * @var \OCP\IConfig
+     */
+    protected $config;
 
-	/**
-	* @param \OCP\IConfig $config
-	*/
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-		parent::__construct();
-	}
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$mode = $this->getMode();
-		$this
-			->setName("background:$mode")
-			->setDescription("Use $mode to run background jobs");
-	}
+    protected function configure() {
+        $mode = $this->getMode();
+        $this
+            ->setName("background:$mode")
+            ->setDescription("Use $mode to run background jobs");
+    }
 
-	/**
-	* Executing this command will set the background job mode for owncloud.
-	* The mode to set is specified by the concrete sub class by implementing the
-	* getMode() function.
-	*
-	* @param InputInterface $input
-	* @param OutputInterface $output
-	*/
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$mode = $this->getMode();
-		$this->config->setAppValue( 'core', 'backgroundjobs_mode', $mode );
-		$output->writeln("Set mode for background jobs to '$mode'");
-	}
+    /**
+     * Executing this command will set the background job mode for owncloud.
+     * The mode to set is specified by the concrete sub class by implementing the
+     * getMode() function.
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $mode = $this->getMode();
+        $this->config->setAppValue( 'core', 'backgroundjobs_mode', $mode );
+        $output->writeln("Set mode for background jobs to '$mode'");
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 	*/
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$mode = $this->getMode();
-		$this->config->setAppValue( 'core', 'backgroundjobs_mode', $mode );
+		$this->config->setAppValue('core', 'backgroundjobs_mode', $mode);
 		$output->writeln("Set mode for background jobs to '$mode'");
 	}
 }

core/Command/Background/Cron.php

Indentation +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@
 
 class Cron extends Base {
 
-	protected function getMode() {
-		return 'cron';
-	}
+    protected function getMode() {
+        return 'cron';
+    }
 }

core/Command/Background/Ajax.php

Indentation +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@
 
 class Ajax extends Base {
 
-	protected function getMode() {
-		return 'ajax';
-	}
+    protected function getMode() {
+        return 'ajax';
+    }
 }

core/Command/Config/ListConfigs.php

Indentation +123 added lines, -123 removed lines

@@ -32,127 +32,127 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListConfigs extends Base {
-	protected $defaultOutputFormat = self::OUTPUT_FORMAT_JSON_PRETTY;
-
-	/** * @var SystemConfig */
-	protected $systemConfig;
-
-	/** @var IAppConfig */
-	protected $appConfig;
-
-	/**
-	 * @param SystemConfig $systemConfig
-	 * @param IAppConfig $appConfig
-	 */
-	public function __construct(SystemConfig $systemConfig, IAppConfig $appConfig) {
-		parent::__construct();
-		$this->systemConfig = $systemConfig;
-		$this->appConfig = $appConfig;
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this
-			->setName('config:list')
-			->setDescription('List all configs')
-			->addArgument(
-				'app',
-				InputArgument::OPTIONAL,
-				'Name of the app ("system" to get the config.php values, "all" for all apps and system)',
-				'all'
-			)
-			->addOption(
-				'private',
-				null,
-				InputOption::VALUE_NONE,
-				'Use this option when you want to include sensitive configs like passwords, salts, ...'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$app = $input->getArgument('app');
-		$noSensitiveValues = !$input->getOption('private');
-
-		switch ($app) {
-			case 'system':
-				$configs = [
-					'system' => $this->getSystemConfigs($noSensitiveValues),
-				];
-			break;
-
-			case 'all':
-				$apps = $this->appConfig->getApps();
-				$configs = [
-					'system' => $this->getSystemConfigs($noSensitiveValues),
-					'apps' => [],
-				];
-				foreach ($apps as $appName) {
-					$configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues);
-				}
-			break;
-
-			default:
-				$configs = [
-					'apps' => [
-						$app => $this->getAppConfigs($app, $noSensitiveValues),
-					],
-				];
-		}
-
-		$this->writeArrayInOutputFormat($input, $output, $configs);
-	}
-
-	/**
-	 * Get the system configs
-	 *
-	 * @param bool $noSensitiveValues
-	 * @return array
-	 */
-	protected function getSystemConfigs($noSensitiveValues) {
-		$keys = $this->systemConfig->getKeys();
-
-		$configs = [];
-		foreach ($keys as $key) {
-			if ($noSensitiveValues) {
-				$value = $this->systemConfig->getFilteredValue($key, serialize(null));
-			} else {
-				$value = $this->systemConfig->getValue($key, serialize(null));
-			}
-
-			if ($value !== 'N;') {
-				$configs[$key] = $value;
-			}
-		}
-
-		return $configs;
-	}
-
-	/**
-	 * Get the app configs
-	 *
-	 * @param string $app
-	 * @param bool $noSensitiveValues
-	 * @return array
-	 */
-	protected function getAppConfigs($app, $noSensitiveValues) {
-		if ($noSensitiveValues) {
-			return $this->appConfig->getFilteredValues($app, false);
-		} else {
-			return $this->appConfig->getValues($app, false);
-		}
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			return array_merge(['all', 'system'], \OC_App::getAllApps());
-		}
-		return [];
-	}
+    protected $defaultOutputFormat = self::OUTPUT_FORMAT_JSON_PRETTY;
+
+    /** * @var SystemConfig */
+    protected $systemConfig;
+
+    /** @var IAppConfig */
+    protected $appConfig;
+
+    /**
+     * @param SystemConfig $systemConfig
+     * @param IAppConfig $appConfig
+     */
+    public function __construct(SystemConfig $systemConfig, IAppConfig $appConfig) {
+        parent::__construct();
+        $this->systemConfig = $systemConfig;
+        $this->appConfig = $appConfig;
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this
+            ->setName('config:list')
+            ->setDescription('List all configs')
+            ->addArgument(
+                'app',
+                InputArgument::OPTIONAL,
+                'Name of the app ("system" to get the config.php values, "all" for all apps and system)',
+                'all'
+            )
+            ->addOption(
+                'private',
+                null,
+                InputOption::VALUE_NONE,
+                'Use this option when you want to include sensitive configs like passwords, salts, ...'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $app = $input->getArgument('app');
+        $noSensitiveValues = !$input->getOption('private');
+
+        switch ($app) {
+            case 'system':
+                $configs = [
+                    'system' => $this->getSystemConfigs($noSensitiveValues),
+                ];
+            break;
+
+            case 'all':
+                $apps = $this->appConfig->getApps();
+                $configs = [
+                    'system' => $this->getSystemConfigs($noSensitiveValues),
+                    'apps' => [],
+                ];
+                foreach ($apps as $appName) {
+                    $configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues);
+                }
+            break;
+
+            default:
+                $configs = [
+                    'apps' => [
+                        $app => $this->getAppConfigs($app, $noSensitiveValues),
+                    ],
+                ];
+        }
+
+        $this->writeArrayInOutputFormat($input, $output, $configs);
+    }
+
+    /**
+     * Get the system configs
+     *
+     * @param bool $noSensitiveValues
+     * @return array
+     */
+    protected function getSystemConfigs($noSensitiveValues) {
+        $keys = $this->systemConfig->getKeys();
+
+        $configs = [];
+        foreach ($keys as $key) {
+            if ($noSensitiveValues) {
+                $value = $this->systemConfig->getFilteredValue($key, serialize(null));
+            } else {
+                $value = $this->systemConfig->getValue($key, serialize(null));
+            }
+
+            if ($value !== 'N;') {
+                $configs[$key] = $value;
+            }
+        }
+
+        return $configs;
+    }
+
+    /**
+     * Get the app configs
+     *
+     * @param string $app
+     * @param bool $noSensitiveValues
+     * @return array
+     */
+    protected function getAppConfigs($app, $noSensitiveValues) {
+        if ($noSensitiveValues) {
+            return $this->appConfig->getFilteredValues($app, false);
+        } else {
+            return $this->appConfig->getValues($app, false);
+        }
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            return array_merge(['all', 'system'], \OC_App::getAllApps());
+        }
+        return [];
+    }
 }