diff options
| author | Daniel Kesselberg <mail@danielkesselberg.de> | 2018-09-13 14:37:06 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2018-10-02 22:24:30 +0200 |
| commit | 6c805ec9baf4aa875cfcbffe5fa5384caff7b7e7 (patch) | |
| tree | 54538ef6b6aec142423dfc71c945c4dda57c2553 | |
| parent | 6b730b4c478bc4f55a89fd7d6a7c2715e2e5b829 (diff) | |
| download | nextcloud-server-6c805ec9baf4aa875cfcbffe5fa5384caff7b7e7.tar.gz nextcloud-server-6c805ec9baf4aa875cfcbffe5fa5384caff7b7e7.zip | |
Add --admin-email to cli installer
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| -rw-r--r-- | core/Command/Maintenance/Install.php | 3 | ||||
| -rw-r--r-- | lib/private/Setup.php | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php index 262def99c5f..3e6ee2a463f 100644 --- a/core/Command/Maintenance/Install.php +++ b/core/Command/Maintenance/Install.php @@ -67,6 +67,7 @@ class Install extends Command { ->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('admin-email', null, InputOption::VALUE_OPTIONAL, 'E-Mail of the admin account') ->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT."/data"); } @@ -141,6 +142,7 @@ class Install extends Command { } $adminLogin = $input->getOption('admin-user'); $adminPassword = $input->getOption('admin-pass'); + $adminEmail = $input->getOption('admin-email'); $dataDir = $input->getOption('data-dir'); if ($db !== 'sqlite') { @@ -179,6 +181,7 @@ class Install extends Command { 'dbtableprefix' => $dbTablePrefix, 'adminlogin' => $adminLogin, 'adminpass' => $adminPassword, + 'adminemail' => $adminEmail, 'directory' => $dataDir ]; if ($db === 'oci') { diff --git a/lib/private/Setup.php b/lib/private/Setup.php index d5ccde6bba3..1d7ea5e0e53 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -52,6 +52,7 @@ use OC\Preview\BackgroundCleanupJob; use OCP\Defaults; use OCP\IL10N; use OCP\ILogger; +use OCP\IUser; use OCP\Security\ISecureRandom; class Setup { @@ -368,6 +369,14 @@ class Setup { if (!$user) { $error[] = "User <$username> could not be created."; } + if ($user instanceof IUser && !empty($options['adminemail'])) { + $adminEmail = htmlspecialchars_decode($options['adminemail']); + if (filter_var($adminEmail, FILTER_VALIDATE_EMAIL)) { + $user->setEMailAddress($adminEmail); + } else { + $error[] = "Invalid e-mail-address <$adminEmail> for <$username>."; + } + } } catch(Exception $exception) { $error[] = $exception->getMessage(); } |