Allow combining --email option with --password-from-env

Signed-off-by: Herman van Rink <rink@initfour.nl>

core/Command/User/Add.php

@@ -103,24 +103,27 @@ class Add extends Command {
 		$password = '';
 		$sendPasswordEmail = false;
 
-		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->getOption('email') !== '') {
-			if (!$this->mailer->validateMailAddress($input->getOption(('email')))) {
+		$email = $input->getOption('email');
+		if (!empty($email)) {
+			if (!$this->mailer->validateMailAddress($email)) {
 				$output->writeln(\sprintf(
 					'<error>The given E-Mail address "%s" is invalid</error>',
-					$input->getOption('email'),
+					$email,
 				));
 
 				return 1;
 			}
+		}
 
-			$output->writeln('Setting a temporary password.');
+		// Setup password.
+		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 (!empty($email)) {
 
 			$passwordEvent = new GenerateSecurePasswordEvent();
 			$this->eventDispatcher->dispatchTyped($passwordEvent);
@@ -170,6 +173,10 @@ class Add extends Command {
 			$output->writeln('Display name set to "' . $user->getDisplayName() . '"');
 		}
 
+		if (!empty($email)) {
+			$user->setSystemEMailAddress($email);
+		}
+
 		$groups = $input->getOption('group');
 
 		if (!empty($groups)) {
@@ -195,8 +202,6 @@ class Add extends Command {
 
 		// Send email to user if we set a temporary password
 		if ($sendPasswordEmail) {
-			$email = $input->getOption('email');
-			$user->setSystemEMailAddress($email);
 
 			if ($this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes') {
 				try {