Update verify-totp.blade.php

[bookstack] / app / Console / Commands / CreateAdmin.php

diff --git a/app/Console/Commands/CreateAdmin.php b/app/Console/Commands/CreateAdmin.php
index a0fb8f31506899d83a2af899efb3d3613300ee41..1494444205c734c31d8f493484f690ec4e472180 100644 (file)
--- a/app/Console/Commands/CreateAdmin.php
+++ b/app/Console/Commands/CreateAdmin.php
@@ -4,6 +4,7 @@ namespace BookStack\Console\Commands;
 
 use BookStack\Auth\UserRepo;
 use Illuminate\Console\Command;
 
 use BookStack\Auth\UserRepo;
 use Illuminate\Console\Command;

+use Symfony\Component\Console\Command\Command as SymfonyCommand;

 
 class CreateAdmin extends Command
 {
 
 class CreateAdmin extends Command
 {


@@ -49,11 +50,15 @@ class CreateAdmin extends Command
             $email = $this->ask('Please specify an email address for the new admin user');
         }
         if (mb_strlen($email) < 5 || !filter_var($email, FILTER_VALIDATE_EMAIL)) {
             $email = $this->ask('Please specify an email address for the new admin user');
         }
         if (mb_strlen($email) < 5 || !filter_var($email, FILTER_VALIDATE_EMAIL)) {

-            return $this->error('Invalid email address provided');
+            $this->error('Invalid email address provided');
+
+            return SymfonyCommand::FAILURE;

         }
 
         if ($this->userRepo->getByEmail($email) !== null) {
         }
 
         if ($this->userRepo->getByEmail($email) !== null) {

-            return $this->error('A user with the provided email already exists!');
+            $this->error('A user with the provided email already exists!');
+
+            return SymfonyCommand::FAILURE;

         }
 
         $name = trim($this->option('name'));
         }
 
         $name = trim($this->option('name'));


@@ -61,7 +66,9 @@ class CreateAdmin extends Command
             $name = $this->ask('Please specify an name for the new admin user');
         }
         if (mb_strlen($name) < 2) {
             $name = $this->ask('Please specify an name for the new admin user');
         }
         if (mb_strlen($name) < 2) {

-            return $this->error('Invalid name provided');
+            $this->error('Invalid name provided');
+
+            return SymfonyCommand::FAILURE;

         }
 
         $password = trim($this->option('password'));
         }
 
         $password = trim($this->option('password'));


@@ -69,7 +76,9 @@ class CreateAdmin extends Command
             $password = $this->secret('Please specify a password for the new admin user');
         }
         if (mb_strlen($password) < 5) {
             $password = $this->secret('Please specify a password for the new admin user');
         }
         if (mb_strlen($password) < 5) {

-            return $this->error('Invalid password provided, Must be at least 5 characters');
+            $this->error('Invalid password provided, Must be at least 5 characters');
+
+            return SymfonyCommand::FAILURE;

         }
 
         $user = $this->userRepo->create(['email' => $email, 'name' => $name, 'password' => $password]);
         }
 
         $user = $this->userRepo->create(['email' => $email, 'name' => $name, 'password' => $password]);


@@ -79,5 +88,7 @@ class CreateAdmin extends Command
         $user->save();
 
         $this->info("Admin account with email \"{$user->email}\" successfully created!");
         $user->save();
 
         $this->info("Admin account with email \"{$user->email}\" successfully created!");

+
+        return SymfonyCommand::SUCCESS;

     }
 }
     }
 }