LDAP: Added TLS support

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

diff --git a/app/Console/Commands/DeleteUsers.php b/app/Console/Commands/DeleteUsers.php
index c287dd55eaf32ab458ba4af1c8b9a3f926bb108f..c73c883de2d2bd75535f817e5c10e03eff3e9ff4 100644 (file)
--- a/app/Console/Commands/DeleteUsers.php
+++ b/app/Console/Commands/DeleteUsers.php
@@ -2,11 +2,12 @@
 
 namespace BookStack\Console\Commands;
 
 
 namespace BookStack\Console\Commands;
 

-use BookStack\User;
-use BookStack\Repos\UserRepo;
+use BookStack\Auth\User;
+use BookStack\Auth\UserRepo;

 use Illuminate\Console\Command;
 
 use Illuminate\Console\Command;
 

-class DeleteUsers extends Command{
+class DeleteUsers extends Command
+{

 
     /**
      * The name and signature of the console command.
 
     /**
      * The name and signature of the console command.


@@ -24,7 +25,7 @@ class DeleteUsers extends Command{
      *
      * @var string
      */
      *
      * @var string
      */

-    protected $description = 'Delete users that are not "admin" or system users.';
+    protected $description = 'Delete users that are not "admin" or system users';

 
     public function __construct(User $user, UserRepo $userRepo)
     {
 
     public function __construct(User $user, UserRepo $userRepo)
     {


@@ -37,14 +38,11 @@ class DeleteUsers extends Command{
     {
         $confirm = $this->ask('This will delete all users from the system that are not "admin" or system users. Are you sure you want to continue? (Type "yes" to continue)');
         $numDeleted = 0;
     {
         $confirm = $this->ask('This will delete all users from the system that are not "admin" or system users. Are you sure you want to continue? (Type "yes" to continue)');
         $numDeleted = 0;

-        if (strtolower(trim($confirm)) === 'yes')
-        {
-            $totalUsers = User::count();
+        if (strtolower(trim($confirm)) === 'yes') {
+            $totalUsers = $this->user->count();

             $users = $this->user->where('system_name', '=', null)->with('roles')->get();
             $users = $this->user->where('system_name', '=', null)->with('roles')->get();

-            foreach ($users as $user)
-            {
-                if ($user->hasRole('admin'))
-                {
+            foreach ($users as $user) {
+                if ($user->hasSystemRole('admin')) {

                     // don't delete users with "admin" role
                     continue;
                 }
                     // don't delete users with "admin" role
                     continue;
                 }


@@ -52,11 +50,8 @@ class DeleteUsers extends Command{
                 ++$numDeleted;
             }
             $this->info("Deleted $numDeleted of $totalUsers total users.");
                 ++$numDeleted;
             }
             $this->info("Deleted $numDeleted of $totalUsers total users.");

-        }
-        else
-        {
+        } else {

             $this->info('Exiting...');
         }
     }
             $this->info('Exiting...');
         }
     }

-

 }
 }