nextcloud / server

core/Command/L10n/CreateJs.php

Indentation +130 added lines, -130 removed lines

@@ -35,134 +35,134 @@
 
 class CreateJs extends Command implements CompletionAwareInterface {
 
-	protected function configure() {
-		$this
-			->setName('l10n:createjs')
-			->setDescription('Create javascript translation files for a given app')
-			->addArgument(
-				'app',
-				InputOption::VALUE_REQUIRED,
-				'name of the app'
-			)
-			->addArgument(
-				'lang',
-				InputOption::VALUE_OPTIONAL,
-				'name of the language'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$app = $input->getArgument('app');
-		$lang = $input->getArgument('lang');
-
-		$path = \OC_App::getAppPath($app);
-		if ($path === false) {
-			$output->writeln("The app <$app> is unknown.");
-			return;
-		}
-		$languages = $lang;
-		if (empty($lang)) {
-			$languages= $this->getAllLanguages($path);
-		}
-
-		foreach($languages as $lang) {
-			$this->writeFiles($app, $path, $lang, $output);
-		}
-	}
-
-	private function getAllLanguages($path) {
-		$result = array();
-		foreach (new DirectoryIterator("$path/l10n") as $fileInfo) {
-			if($fileInfo->isDot()) {
-				continue;
-			}
-			if($fileInfo->isDir()) {
-				continue;
-			}
-			if($fileInfo->getExtension() !== 'php') {
-				continue;
-			}
-			$result[]= substr($fileInfo->getBasename(), 0, -4);
-		}
-
-		return $result;
-	}
-
-	private function writeFiles($app, $path, $lang, OutputInterface $output) {
-		list($translations, $plurals) = $this->loadTranslations($path, $lang);
-		$this->writeJsFile($app, $path, $lang, $output, $translations, $plurals);
-		$this->writeJsonFile($path, $lang, $output, $translations, $plurals);
-	}
-
-	private function writeJsFile($app, $path, $lang, OutputInterface $output, $translations, $plurals) {
-		$jsFile = "$path/l10n/$lang.js";
-		if (file_exists($jsFile)) {
-			$output->writeln("File already exists: $jsFile");
-			return;
-		}
-		$content = "OC.L10N.register(\n    \"$app\",\n    {\n    ";
-		$jsTrans = array();
-		foreach ($translations as $id => $val) {
-			if (is_array($val)) {
-				$val = '[ ' . join(',', $val) . ']';
-			}
-			$jsTrans[] = "\"$id\" : \"$val\"";
-		}
-		$content .= join(",\n    ", $jsTrans);
-		$content .= "\n},\n\"$plurals\");\n";
-
-		file_put_contents($jsFile, $content);
-		$output->writeln("Javascript translation file generated: $jsFile");
-	}
-
-	private function writeJsonFile($path, $lang, OutputInterface $output, $translations, $plurals) {
-		$jsFile = "$path/l10n/$lang.json";
-		if (file_exists($jsFile)) {
-			$output->writeln("File already exists: $jsFile");
-			return;
-		}
-		$content = array('translations' => $translations, 'pluralForm' => $plurals);
-		file_put_contents($jsFile, json_encode($content));
-		$output->writeln("Json translation file generated: $jsFile");
-	}
-
-	private function loadTranslations($path, $lang) {
-		$phpFile = "$path/l10n/$lang.php";
-		$TRANSLATIONS = array();
-		$PLURAL_FORMS = '';
-		if (!file_exists($phpFile)) {
-			throw new UnexpectedValueException("PHP translation file <$phpFile> does not exist.");
-		}
-		require $phpFile;
-
-		return array($TRANSLATIONS, $PLURAL_FORMS);
-	}
-
-	/**
-	 * Return possible values for the named option
-	 *
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * Return possible values for the named argument
-	 *
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			return \OC_App::getAllApps();
-		} else if ($argumentName === 'lang') {
-			$appName = $context->getWordAtIndex($context->getWordIndex() - 1);
-			return $this->getAllLanguages(\OC_App::getAppPath($appName));
-		}
-		return [];
-	}
+    protected function configure() {
+        $this
+            ->setName('l10n:createjs')
+            ->setDescription('Create javascript translation files for a given app')
+            ->addArgument(
+                'app',
+                InputOption::VALUE_REQUIRED,
+                'name of the app'
+            )
+            ->addArgument(
+                'lang',
+                InputOption::VALUE_OPTIONAL,
+                'name of the language'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $app = $input->getArgument('app');
+        $lang = $input->getArgument('lang');
+
+        $path = \OC_App::getAppPath($app);
+        if ($path === false) {
+            $output->writeln("The app <$app> is unknown.");
+            return;
+        }
+        $languages = $lang;
+        if (empty($lang)) {
+            $languages= $this->getAllLanguages($path);
+        }
+
+        foreach($languages as $lang) {
+            $this->writeFiles($app, $path, $lang, $output);
+        }
+    }
+
+    private function getAllLanguages($path) {
+        $result = array();
+        foreach (new DirectoryIterator("$path/l10n") as $fileInfo) {
+            if($fileInfo->isDot()) {
+                continue;
+            }
+            if($fileInfo->isDir()) {
+                continue;
+            }
+            if($fileInfo->getExtension() !== 'php') {
+                continue;
+            }
+            $result[]= substr($fileInfo->getBasename(), 0, -4);
+        }
+
+        return $result;
+    }
+
+    private function writeFiles($app, $path, $lang, OutputInterface $output) {
+        list($translations, $plurals) = $this->loadTranslations($path, $lang);
+        $this->writeJsFile($app, $path, $lang, $output, $translations, $plurals);
+        $this->writeJsonFile($path, $lang, $output, $translations, $plurals);
+    }
+
+    private function writeJsFile($app, $path, $lang, OutputInterface $output, $translations, $plurals) {
+        $jsFile = "$path/l10n/$lang.js";
+        if (file_exists($jsFile)) {
+            $output->writeln("File already exists: $jsFile");
+            return;
+        }
+        $content = "OC.L10N.register(\n    \"$app\",\n    {\n    ";
+        $jsTrans = array();
+        foreach ($translations as $id => $val) {
+            if (is_array($val)) {
+                $val = '[ ' . join(',', $val) . ']';
+            }
+            $jsTrans[] = "\"$id\" : \"$val\"";
+        }
+        $content .= join(",\n    ", $jsTrans);
+        $content .= "\n},\n\"$plurals\");\n";
+
+        file_put_contents($jsFile, $content);
+        $output->writeln("Javascript translation file generated: $jsFile");
+    }
+
+    private function writeJsonFile($path, $lang, OutputInterface $output, $translations, $plurals) {
+        $jsFile = "$path/l10n/$lang.json";
+        if (file_exists($jsFile)) {
+            $output->writeln("File already exists: $jsFile");
+            return;
+        }
+        $content = array('translations' => $translations, 'pluralForm' => $plurals);
+        file_put_contents($jsFile, json_encode($content));
+        $output->writeln("Json translation file generated: $jsFile");
+    }
+
+    private function loadTranslations($path, $lang) {
+        $phpFile = "$path/l10n/$lang.php";
+        $TRANSLATIONS = array();
+        $PLURAL_FORMS = '';
+        if (!file_exists($phpFile)) {
+            throw new UnexpectedValueException("PHP translation file <$phpFile> does not exist.");
+        }
+        require $phpFile;
+
+        return array($TRANSLATIONS, $PLURAL_FORMS);
+    }
+
+    /**
+     * Return possible values for the named option
+     *
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * Return possible values for the named argument
+     *
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            return \OC_App::getAllApps();
+        } else if ($argumentName === 'lang') {
+            $appName = $context->getWordAtIndex($context->getWordIndex() - 1);
+            return $this->getAllLanguages(\OC_App::getAppPath($appName));
+        }
+        return [];
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -62,10 +62,10 @@ 
 		}
 		$languages = $lang;
 		if (empty($lang)) {
-			$languages= $this->getAllLanguages($path);
+			$languages = $this->getAllLanguages($path);
 		}
 
-		foreach($languages as $lang) {
+		foreach ($languages as $lang) {
 			$this->writeFiles($app, $path, $lang, $output);
 		}
 	}
@@ -73,16 +73,16 @@ 
 	private function getAllLanguages($path) {
 		$result = array();
 		foreach (new DirectoryIterator("$path/l10n") as $fileInfo) {
-			if($fileInfo->isDot()) {
+			if ($fileInfo->isDot()) {
 				continue;
 			}
-			if($fileInfo->isDir()) {
+			if ($fileInfo->isDir()) {
 				continue;
 			}
-			if($fileInfo->getExtension() !== 'php') {
+			if ($fileInfo->getExtension() !== 'php') {
 				continue;
 			}
-			$result[]= substr($fileInfo->getBasename(), 0, -4);
+			$result[] = substr($fileInfo->getBasename(), 0, -4);
 		}
 
 		return $result;
@@ -104,7 +104,7 @@ 
 		$jsTrans = array();
 		foreach ($translations as $id => $val) {
 			if (is_array($val)) {
-				$val = '[ ' . join(',', $val) . ']';
+				$val = '[ '.join(',', $val).']';
 			}
 			$jsTrans[] = "\"$id\" : \"$val\"";
 		}

core/Command/Status.php

Indentation +16 added lines, -16 removed lines

@@ -28,23 +28,23 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Status extends Base {
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('status')
-			->setDescription('show some status information')
-		;
-	}
+        $this
+            ->setName('status')
+            ->setDescription('show some status information')
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$values = array(
-			'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false),
-			'version' => implode('.', \OCP\Util::getVersion()),
-			'versionstring' => \OC_Util::getVersionString(),
-			'edition' => '',
-		);
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $values = array(
+            'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false),
+            'version' => implode('.', \OCP\Util::getVersion()),
+            'versionstring' => \OC_Util::getVersionString(),
+            'edition' => '',
+        );
 
-		$this->writeArrayInOutputFormat($input, $output, $values);
-	}
+        $this->writeArrayInOutputFormat($input, $output, $values);
+    }
 }

core/Command/TwoFactorAuth/Enable.php

Indentation +25 added lines, -25 removed lines

@@ -30,35 +30,35 @@
 
 class Enable extends Base {
 
-	/** @var Manager */
-	private $manager;
+    /** @var Manager */
+    private $manager;
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	public function __construct(Manager $manager, IUserManager $userManager) {
-		parent::__construct('twofactorauth:enable');
-		$this->manager = $manager;
-		$this->userManager = $userManager;
-	}
+    public function __construct(Manager $manager, IUserManager $userManager) {
+        parent::__construct('twofactorauth:enable');
+        $this->manager = $manager;
+        $this->userManager = $userManager;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this->setName('twofactorauth:enable');
-		$this->setDescription('Enable two-factor authentication for a user');
-		$this->addArgument('uid', InputArgument::REQUIRED);
-	}
+        $this->setName('twofactorauth:enable');
+        $this->setDescription('Enable two-factor authentication for a user');
+        $this->addArgument('uid', InputArgument::REQUIRED);
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$uid = $input->getArgument('uid');
-		$user = $this->userManager->get($uid);
-		if (is_null($user)) {
-			$output->writeln("<error>Invalid UID</error>");
-			return;
-		}
-		$this->manager->enableTwoFactorAuthentication($user);
-		$output->writeln("Two-factor authentication enabled for user $uid");
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $uid = $input->getArgument('uid');
+        $user = $this->userManager->get($uid);
+        if (is_null($user)) {
+            $output->writeln("<error>Invalid UID</error>");
+            return;
+        }
+        $this->manager->enableTwoFactorAuthentication($user);
+        $output->writeln("Two-factor authentication enabled for user $uid");
+    }
 
 }

core/Command/TwoFactorAuth/Base.php

Indentation +27 added lines, -27 removed lines

@@ -28,33 +28,33 @@
 
 class Base extends \OC\Core\Command\Base implements CompletionAwareInterface {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/**
-	 * Return possible values for the named option
-	 *
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
+    /**
+     * Return possible values for the named option
+     *
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
 
-	/**
-	 * Return possible values for the named argument
-	 *
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'uid') {
-			return array_map(function(IUser $user) {
-				return $user->getUID();
-			}, $this->userManager->search($context->getCurrentWord(), 100));
-		}
-		return [];
-	}
+    /**
+     * Return possible values for the named argument
+     *
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'uid') {
+            return array_map(function(IUser $user) {
+                return $user->getUID();
+            }, $this->userManager->search($context->getCurrentWord(), 100));
+        }
+        return [];
+    }
 }

core/Command/TwoFactorAuth/Disable.php

Indentation +25 added lines, -25 removed lines

@@ -30,35 +30,35 @@
 
 class Disable extends Base {
 
-	/** @var Manager */
-	private $manager;
+    /** @var Manager */
+    private $manager;
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	public function __construct(Manager $manager, IUserManager $userManager) {
-		parent::__construct('twofactorauth:disable');
-		$this->manager = $manager;
-		$this->userManager = $userManager;
-	}
+    public function __construct(Manager $manager, IUserManager $userManager) {
+        parent::__construct('twofactorauth:disable');
+        $this->manager = $manager;
+        $this->userManager = $userManager;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this->setName('twofactorauth:disable');
-		$this->setDescription('Disable two-factor authentication for a user');
-		$this->addArgument('uid', InputArgument::REQUIRED);
-	}
+        $this->setName('twofactorauth:disable');
+        $this->setDescription('Disable two-factor authentication for a user');
+        $this->addArgument('uid', InputArgument::REQUIRED);
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$uid = $input->getArgument('uid');
-		$user = $this->userManager->get($uid);
-		if (is_null($user)) {
-			$output->writeln("<error>Invalid UID</error>");
-			return;
-		}
-		$this->manager->disableTwoFactorAuthentication($user);
-		$output->writeln("Two-factor authentication disabled for user $uid");
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $uid = $input->getArgument('uid');
+        $user = $this->userManager->get($uid);
+        if (is_null($user)) {
+            $output->writeln("<error>Invalid UID</error>");
+            return;
+        }
+        $this->manager->disableTwoFactorAuthentication($user);
+        $output->writeln("Two-factor authentication disabled for user $uid");
+    }
 
 }

core/Command/Maintenance/Install.php

Spacing +5 added lines, -5 removed lines

@@ -78,8 +78,8 @@ 
 			$this->printErrors($output, $errors);
 
 			// ignore the OS X setup warning
-			if(count($errors) !== 1 ||
-				(string)($errors[0]['error']) !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
+			if (count($errors) !== 1 ||
+				(string) ($errors[0]['error']) !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
 				return 1;
 			}
 		}
@@ -180,10 +180,10 @@ 
 	protected function printErrors(OutputInterface $output, $errors) {
 		foreach ($errors as $error) {
 			if (is_array($error)) {
-				$output->writeln('<error>' . (string)$error['error'] . '</error>');
-				$output->writeln('<info> -> ' . (string)$error['hint'] . '</info>');
+				$output->writeln('<error>'.(string) $error['error'].'</error>');
+				$output->writeln('<info> -> '.(string) $error['hint'].'</info>');
 			} else {
-				$output->writeln('<error>' . (string)$error . '</error>');
+				$output->writeln('<error>'.(string) $error.'</error>');
 			}
 		}
 	}

Indentation +158 added lines, -158 removed lines

@@ -43,162 +43,162 @@
 
 class Install extends Command {
 
-	/**
-	 * @var SystemConfig
-	 */
-	private $config;
-
-	public function __construct(SystemConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
-
-	protected function configure() {
-		$this
-			->setName('maintenance:install')
-			->setDescription('install Nextcloud')
-			->addOption('database', null, InputOption::VALUE_REQUIRED, 'Supported database type', 'sqlite')
-			->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
-			->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
-			->addOption('database-port', null, InputOption::VALUE_REQUIRED, 'Port the database is listening on')
-			->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'User name to connect to the database')
-			->addOption('database-pass', null, InputOption::VALUE_OPTIONAL, 'Password of the database user', null)
-			->addOption('database-table-prefix', null, InputOption::VALUE_OPTIONAL, 'Prefix for all tables (default: oc_)', null)
-			->addOption('database-table-space', null, InputOption::VALUE_OPTIONAL, 'Table space of the database (oci only)', null)
-			->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'User name of the admin account', 'admin')
-			->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account')
-			->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT."/data");
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-
-		// validate the environment
-		$server = \OC::$server;
-		$setupHelper = new Setup(
-			$this->config,
-			$server->getIniWrapper(),
-			$server->getL10N('lib'),
-			$server->query(Defaults::class),
-			$server->getLogger(),
-			$server->getSecureRandom(),
-			\OC::$server->query(Installer::class)
-		);
-		$sysInfo = $setupHelper->getSystemInfo(true);
-		$errors = $sysInfo['errors'];
-		if (count($errors) > 0) {
-			$this->printErrors($output, $errors);
-
-			// ignore the OS X setup warning
-			if(count($errors) !== 1 ||
-				(string)($errors[0]['error']) !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
-				return 1;
-			}
-		}
-
-		// validate user input
-		$options = $this->validateInput($input, $output, array_keys($sysInfo['databases']));
-
-		// perform installation
-		$errors = $setupHelper->install($options);
-		if (count($errors) > 0) {
-			$this->printErrors($output, $errors);
-			return 1;
-		}
-		$output->writeln("Nextcloud was successfully installed");
-		return 0;
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @param string[] $supportedDatabases
-	 * @return array
-	 */
-	protected function validateInput(InputInterface $input, OutputInterface $output, $supportedDatabases) {
-		$db = strtolower($input->getOption('database'));
-
-		if (!in_array($db, $supportedDatabases)) {
-			throw new InvalidArgumentException("Database <$db> is not supported.");
-		}
-
-		$dbUser = $input->getOption('database-user');
-		$dbPass = $input->getOption('database-pass');
-		$dbName = $input->getOption('database-name');
-		$dbPort = $input->getOption('database-port');
-		if ($db === 'oci') {
-			// an empty hostname needs to be read from the raw parameters
-			$dbHost = $input->getParameterOption('--database-host', '');
-		} else {
-			$dbHost = $input->getOption('database-host');
-		}
-		$dbTablePrefix = 'oc_';
-		if ($input->hasParameterOption('--database-table-prefix')) {
-			$dbTablePrefix = (string) $input->getOption('database-table-prefix');
-			$dbTablePrefix = trim($dbTablePrefix);
-		}
-		if ($input->hasParameterOption('--database-pass')) {
-			$dbPass = (string) $input->getOption('database-pass');
-		}
-		$adminLogin = $input->getOption('admin-user');
-		$adminPassword = $input->getOption('admin-pass');
-		$dataDir = $input->getOption('data-dir');
-
-		if ($db !== 'sqlite') {
-			if (is_null($dbUser)) {
-				throw new InvalidArgumentException("Database user not provided.");
-			}
-			if (is_null($dbName)) {
-				throw new InvalidArgumentException("Database name not provided.");
-			}
-			if (is_null($dbPass)) {
-				/** @var QuestionHelper $helper */
-				$helper = $this->getHelper('question');
-				$question = new Question('What is the password to access the database with user <'.$dbUser.'>?');
-				$question->setHidden(true);
-				$question->setHiddenFallback(false);
-				$dbPass = $helper->ask($input, $output, $question);
-			}
-		}
-
-		if (is_null($adminPassword)) {
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-			$question = new Question('What is the password you like to use for the admin account <'.$adminLogin.'>?');
-			$question->setHidden(true);
-			$question->setHiddenFallback(false);
-			$adminPassword = $helper->ask($input, $output, $question);
-		}
-
-		$options = [
-			'dbtype' => $db,
-			'dbuser' => $dbUser,
-			'dbpass' => $dbPass,
-			'dbname' => $dbName,
-			'dbhost' => $dbHost,
-			'dbport' => $dbPort,
-			'dbtableprefix' => $dbTablePrefix,
-			'adminlogin' => $adminLogin,
-			'adminpass' => $adminPassword,
-			'directory' => $dataDir
-		];
-		if ($db === 'oci') {
-			$options['dbtablespace'] = $input->getParameterOption('--database-table-space', '');
-		}
-		return $options;
-	}
-
-	/**
-	 * @param OutputInterface $output
-	 * @param $errors
-	 */
-	protected function printErrors(OutputInterface $output, $errors) {
-		foreach ($errors as $error) {
-			if (is_array($error)) {
-				$output->writeln('<error>' . (string)$error['error'] . '</error>');
-				$output->writeln('<info> -> ' . (string)$error['hint'] . '</info>');
-			} else {
-				$output->writeln('<error>' . (string)$error . '</error>');
-			}
-		}
-	}
+    /**
+     * @var SystemConfig
+     */
+    private $config;
+
+    public function __construct(SystemConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('maintenance:install')
+            ->setDescription('install Nextcloud')
+            ->addOption('database', null, InputOption::VALUE_REQUIRED, 'Supported database type', 'sqlite')
+            ->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
+            ->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
+            ->addOption('database-port', null, InputOption::VALUE_REQUIRED, 'Port the database is listening on')
+            ->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'User name to connect to the database')
+            ->addOption('database-pass', null, InputOption::VALUE_OPTIONAL, 'Password of the database user', null)
+            ->addOption('database-table-prefix', null, InputOption::VALUE_OPTIONAL, 'Prefix for all tables (default: oc_)', null)
+            ->addOption('database-table-space', null, InputOption::VALUE_OPTIONAL, 'Table space of the database (oci only)', null)
+            ->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'User name of the admin account', 'admin')
+            ->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account')
+            ->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT."/data");
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+
+        // validate the environment
+        $server = \OC::$server;
+        $setupHelper = new Setup(
+            $this->config,
+            $server->getIniWrapper(),
+            $server->getL10N('lib'),
+            $server->query(Defaults::class),
+            $server->getLogger(),
+            $server->getSecureRandom(),
+            \OC::$server->query(Installer::class)
+        );
+        $sysInfo = $setupHelper->getSystemInfo(true);
+        $errors = $sysInfo['errors'];
+        if (count($errors) > 0) {
+            $this->printErrors($output, $errors);
+
+            // ignore the OS X setup warning
+            if(count($errors) !== 1 ||
+                (string)($errors[0]['error']) !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
+                return 1;
+            }
+        }
+
+        // validate user input
+        $options = $this->validateInput($input, $output, array_keys($sysInfo['databases']));
+
+        // perform installation
+        $errors = $setupHelper->install($options);
+        if (count($errors) > 0) {
+            $this->printErrors($output, $errors);
+            return 1;
+        }
+        $output->writeln("Nextcloud was successfully installed");
+        return 0;
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @param string[] $supportedDatabases
+     * @return array
+     */
+    protected function validateInput(InputInterface $input, OutputInterface $output, $supportedDatabases) {
+        $db = strtolower($input->getOption('database'));
+
+        if (!in_array($db, $supportedDatabases)) {
+            throw new InvalidArgumentException("Database <$db> is not supported.");
+        }
+
+        $dbUser = $input->getOption('database-user');
+        $dbPass = $input->getOption('database-pass');
+        $dbName = $input->getOption('database-name');
+        $dbPort = $input->getOption('database-port');
+        if ($db === 'oci') {
+            // an empty hostname needs to be read from the raw parameters
+            $dbHost = $input->getParameterOption('--database-host', '');
+        } else {
+            $dbHost = $input->getOption('database-host');
+        }
+        $dbTablePrefix = 'oc_';
+        if ($input->hasParameterOption('--database-table-prefix')) {
+            $dbTablePrefix = (string) $input->getOption('database-table-prefix');
+            $dbTablePrefix = trim($dbTablePrefix);
+        }
+        if ($input->hasParameterOption('--database-pass')) {
+            $dbPass = (string) $input->getOption('database-pass');
+        }
+        $adminLogin = $input->getOption('admin-user');
+        $adminPassword = $input->getOption('admin-pass');
+        $dataDir = $input->getOption('data-dir');
+
+        if ($db !== 'sqlite') {
+            if (is_null($dbUser)) {
+                throw new InvalidArgumentException("Database user not provided.");
+            }
+            if (is_null($dbName)) {
+                throw new InvalidArgumentException("Database name not provided.");
+            }
+            if (is_null($dbPass)) {
+                /** @var QuestionHelper $helper */
+                $helper = $this->getHelper('question');
+                $question = new Question('What is the password to access the database with user <'.$dbUser.'>?');
+                $question->setHidden(true);
+                $question->setHiddenFallback(false);
+                $dbPass = $helper->ask($input, $output, $question);
+            }
+        }
+
+        if (is_null($adminPassword)) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+            $question = new Question('What is the password you like to use for the admin account <'.$adminLogin.'>?');
+            $question->setHidden(true);
+            $question->setHiddenFallback(false);
+            $adminPassword = $helper->ask($input, $output, $question);
+        }
+
+        $options = [
+            'dbtype' => $db,
+            'dbuser' => $dbUser,
+            'dbpass' => $dbPass,
+            'dbname' => $dbName,
+            'dbhost' => $dbHost,
+            'dbport' => $dbPort,
+            'dbtableprefix' => $dbTablePrefix,
+            'adminlogin' => $adminLogin,
+            'adminpass' => $adminPassword,
+            'directory' => $dataDir
+        ];
+        if ($db === 'oci') {
+            $options['dbtablespace'] = $input->getParameterOption('--database-table-space', '');
+        }
+        return $options;
+    }
+
+    /**
+     * @param OutputInterface $output
+     * @param $errors
+     */
+    protected function printErrors(OutputInterface $output, $errors) {
+        foreach ($errors as $error) {
+            if (is_array($error)) {
+                $output->writeln('<error>' . (string)$error['error'] . '</error>');
+                $output->writeln('<info> -> ' . (string)$error['hint'] . '</info>');
+            } else {
+                $output->writeln('<error>' . (string)$error . '</error>');
+            }
+        }
+    }
 }

core/Command/Maintenance/DataFingerprint.php

Indentation +18 added lines, -18 removed lines

@@ -30,25 +30,25 @@
 
 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) {
-		$this->config->setSystemValue('data-fingerprint', md5($this->timeFactory->getTime()));
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $this->config->setSystemValue('data-fingerprint', md5($this->timeFactory->getTime()));
+    }
 }

core/Command/Maintenance/Repair.php

Spacing +4 added lines, -4 removed lines

@@ -132,16 +132,16 @@
 				$this->output->writeln('');
 				break;
 			case '\OC\Repair::step':
-				$this->output->writeln(' - ' . $event->getArgument(0));
+				$this->output->writeln(' - '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::info':
-				$this->output->writeln('     - ' . $event->getArgument(0));
+				$this->output->writeln('     - '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::warning':
-				$this->output->writeln('     - WARNING: ' . $event->getArgument(0));
+				$this->output->writeln('     - WARNING: '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::error':
-				$this->output->writeln('     - ERROR: ' . $event->getArgument(0));
+				$this->output->writeln('     - ERROR: '.$event->getArgument(0));
 				break;
 		}
 	}

Indentation +103 added lines, -103 removed lines

@@ -38,116 +38,116 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Repair extends Command {
-	/** @var \OC\Repair $repair */
-	protected $repair;
-	/** @var IConfig */
-	protected $config;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-	/** @var ProgressBar */
-	private $progress;
-	/** @var OutputInterface */
-	private $output;
-	/** @var IAppManager */
-	private $appManager;
+    /** @var \OC\Repair $repair */
+    protected $repair;
+    /** @var IConfig */
+    protected $config;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+    /** @var ProgressBar */
+    private $progress;
+    /** @var OutputInterface */
+    private $output;
+    /** @var IAppManager */
+    private $appManager;
 
-	/**
-	 * @param \OC\Repair $repair
-	 * @param IConfig $config
-	 * @param EventDispatcherInterface $dispatcher
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(\OC\Repair $repair, IConfig $config, EventDispatcherInterface $dispatcher, IAppManager $appManager) {
-		$this->repair = $repair;
-		$this->config = $config;
-		$this->dispatcher = $dispatcher;
-		$this->appManager = $appManager;
-		parent::__construct();
-	}
+    /**
+     * @param \OC\Repair $repair
+     * @param IConfig $config
+     * @param EventDispatcherInterface $dispatcher
+     * @param IAppManager $appManager
+     */
+    public function __construct(\OC\Repair $repair, IConfig $config, EventDispatcherInterface $dispatcher, IAppManager $appManager) {
+        $this->repair = $repair;
+        $this->config = $config;
+        $this->dispatcher = $dispatcher;
+        $this->appManager = $appManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('maintenance:repair')
-			->setDescription('repair this installation')
-			->addOption(
-				'include-expensive',
-				null,
-				InputOption::VALUE_NONE,
-				'Use this option when you want to include resource and load expensive tasks');
-	}
+    protected function configure() {
+        $this
+            ->setName('maintenance:repair')
+            ->setDescription('repair this installation')
+            ->addOption(
+                'include-expensive',
+                null,
+                InputOption::VALUE_NONE,
+                'Use this option when you want to include resource and load expensive tasks');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$includeExpensive = $input->getOption('include-expensive');
-		if ($includeExpensive) {
-			foreach ($this->repair->getExpensiveRepairSteps() as $step) {
-				$this->repair->addStep($step);
-			}
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $includeExpensive = $input->getOption('include-expensive');
+        if ($includeExpensive) {
+            foreach ($this->repair->getExpensiveRepairSteps() as $step) {
+                $this->repair->addStep($step);
+            }
+        }
 
-		$apps = $this->appManager->getInstalledApps();
-		foreach ($apps as $app) {
-			if (!$this->appManager->isEnabledForUser($app)) {
-				continue;
-			}
-			$info = \OC_App::getAppInfo($app);
-			if (!is_array($info)) {
-				continue;
-			}
-			$steps = $info['repair-steps']['post-migration'];
-			foreach ($steps as $step) {
-				try {
-					$this->repair->addStep($step);
-				} catch (Exception $ex) {
-					$output->writeln("<error>Failed to load repair step for $app: {$ex->getMessage()}</error>");
-				}
-			}
-		}
+        $apps = $this->appManager->getInstalledApps();
+        foreach ($apps as $app) {
+            if (!$this->appManager->isEnabledForUser($app)) {
+                continue;
+            }
+            $info = \OC_App::getAppInfo($app);
+            if (!is_array($info)) {
+                continue;
+            }
+            $steps = $info['repair-steps']['post-migration'];
+            foreach ($steps as $step) {
+                try {
+                    $this->repair->addStep($step);
+                } catch (Exception $ex) {
+                    $output->writeln("<error>Failed to load repair step for $app: {$ex->getMessage()}</error>");
+                }
+            }
+        }
 
-		$maintenanceMode = $this->config->getSystemValue('maintenance', false);
-		$this->config->setSystemValue('maintenance', true);
+        $maintenanceMode = $this->config->getSystemValue('maintenance', false);
+        $this->config->setSystemValue('maintenance', true);
 
-		$this->progress = new ProgressBar($output);
-		$this->output = $output;
-		$this->dispatcher->addListener('\OC\Repair::startProgress', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::advance', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::finishProgress', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::step', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::info', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::warning', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::error', [$this, 'handleRepairFeedBack']);
+        $this->progress = new ProgressBar($output);
+        $this->output = $output;
+        $this->dispatcher->addListener('\OC\Repair::startProgress', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::advance', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::finishProgress', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::step', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::info', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::warning', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::error', [$this, 'handleRepairFeedBack']);
 
-		$this->repair->run();
+        $this->repair->run();
 
-		$this->config->setSystemValue('maintenance', $maintenanceMode);
-	}
+        $this->config->setSystemValue('maintenance', $maintenanceMode);
+    }
 
-	public function handleRepairFeedBack($event) {
-		if (!$event instanceof GenericEvent) {
-			return;
-		}
-		switch ($event->getSubject()) {
-			case '\OC\Repair::startProgress':
-				$this->progress->start($event->getArgument(0));
-				break;
-			case '\OC\Repair::advance':
-				$this->progress->advance($event->getArgument(0));
-				break;
-			case '\OC\Repair::finishProgress':
-				$this->progress->finish();
-				$this->output->writeln('');
-				break;
-			case '\OC\Repair::step':
-				$this->output->writeln(' - ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::info':
-				$this->output->writeln('     - ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::warning':
-				$this->output->writeln('     - WARNING: ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::error':
-				$this->output->writeln('     - ERROR: ' . $event->getArgument(0));
-				break;
-		}
-	}
+    public function handleRepairFeedBack($event) {
+        if (!$event instanceof GenericEvent) {
+            return;
+        }
+        switch ($event->getSubject()) {
+            case '\OC\Repair::startProgress':
+                $this->progress->start($event->getArgument(0));
+                break;
+            case '\OC\Repair::advance':
+                $this->progress->advance($event->getArgument(0));
+                break;
+            case '\OC\Repair::finishProgress':
+                $this->progress->finish();
+                $this->output->writeln('');
+                break;
+            case '\OC\Repair::step':
+                $this->output->writeln(' - ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::info':
+                $this->output->writeln('     - ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::warning':
+                $this->output->writeln('     - WARNING: ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::error':
+                $this->output->writeln('     - ERROR: ' . $event->getArgument(0));
+                break;
+        }
+    }
 }

core/Command/Maintenance/UpdateHtaccess.php

Indentation +14 added lines, -14 removed lines

@@ -31,19 +31,19 @@
 
 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) {
-		if (\OC\Setup::updateHtaccess()) {
-			$output->writeln('.htaccess has been updated');
-			return 0;
-		} else {
-			$output->writeln('<error>Error updating .htaccess file, not enough permissions?</error>');
-			return 1;
-		}
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        if (\OC\Setup::updateHtaccess()) {
+            $output->writeln('.htaccess has been updated');
+            return 0;
+        } else {
+            $output->writeln('<error>Error updating .htaccess file, not enough permissions?</error>');
+            return 1;
+        }
+    }
 }