Make building of search results work for multi-byte encoded characters

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

diff --git a/app/Console/Commands/CreateAdmin.php b/app/Console/Commands/CreateAdmin.php
index 90c1ddb1c325e4e67761b5a81d9d602ad254c103..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
 {


@@ -28,8 +29,6 @@ class CreateAdmin extends Command
 
     /**
      * Create a new command instance.
 
     /**
      * Create a new command instance.

-     *
-     * @param UserRepo $userRepo

      */
     public function __construct(UserRepo $userRepo)
     {
      */
     public function __construct(UserRepo $userRepo)
     {


@@ -40,8 +39,9 @@ class CreateAdmin extends Command
     /**
      * Execute the console command.
      *
     /**
      * Execute the console command.
      *

-     * @return mixed

      * @throws \BookStack\Exceptions\NotFoundException
      * @throws \BookStack\Exceptions\NotFoundException

+     *
+     * @return mixed

      */
     public function handle()
     {
      */
     public function handle()
     {


@@ -49,30 +49,37 @@ class CreateAdmin extends Command
         if (empty($email)) {
             $email = $this->ask('Please specify an email address for the new admin user');
         }
         if (empty($email)) {
             $email = $this->ask('Please specify an email address for the new admin user');
         }

-        if (strlen($email) < 5 || !filter_var($email, FILTER_VALIDATE_EMAIL)) {
-            return $this->error('Invalid email address provided');
+        if (mb_strlen($email) < 5 || !filter_var($email, FILTER_VALIDATE_EMAIL)) {
+            $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'));
         if (empty($name)) {
             $name = $this->ask('Please specify an name for the new admin user');
         }
         }
 
         $name = trim($this->option('name'));
         if (empty($name)) {
             $name = $this->ask('Please specify an name for the new admin user');
         }

-        if (strlen($name) < 2) {
-            return $this->error('Invalid name provided');
+        if (mb_strlen($name) < 2) {
+            $this->error('Invalid name provided');
+
+            return SymfonyCommand::FAILURE;

         }
 
         $password = trim($this->option('password'));
         if (empty($password)) {
             $password = $this->secret('Please specify a password for the new admin user');
         }
         }
 
         $password = trim($this->option('password'));
         if (empty($password)) {
             $password = $this->secret('Please specify a password for the new admin user');
         }

-        if (strlen($password) < 5) {
-            return $this->error('Invalid password provided, Must be at least 5 characters');
-        }
+        if (mb_strlen($password) < 5) {
+            $this->error('Invalid password provided, Must be at least 5 characters');

 
 

+            return SymfonyCommand::FAILURE;
+        }

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


@@ -81,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;

     }
 }
     }
 }