Added mulit image-type compatability to manager & app and added scaled image selection

[bookstack] / app / Http / Controllers / UserController.php

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 306641e71de4caa432206b42459ebeee23f70112..d1c328b86a9a01e03798d8d6c2d43bf12dea4444 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -1,26 +1,30 @@
 <?php
 
-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;
 
 use Illuminate\Http\Request;
 
 use Illuminate\Support\Facades\Hash;
-use Oxbow\Http\Requests;
-use Oxbow\Services\SocialAuthService;
-use Oxbow\User;
+use BookStack\Http\Requests;
+use BookStack\Repos\UserRepo;
+use BookStack\Services\SocialAuthService;
+use BookStack\User;
 
 class UserController extends Controller
 {
 
     protected $user;
+    protected $userRepo;
 
     /**
      * UserController constructor.
-     * @param $user
+     * @param User     $user
+     * @param UserRepo $userRepo
      */
-    public function __construct(User $user)
+    public function __construct(User $user, UserRepo $userRepo)
     {
         $this->user = $user;
+        $this->userRepo = $userRepo;
         parent::__construct();
     }
 
@@ -32,6 +36,7 @@ class UserController extends Controller
     public function index()
     {
         $users = $this->user->all();
+        $this->setPageTitle('Users');
         return view('users/index', ['users' => $users]);
     }
 
@@ -87,6 +92,7 @@ class UserController extends Controller
 
         $user = $this->user->findOrFail($id);
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
+        $this->setPageTitle('User Profile');
         return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers]);
     }
 
@@ -118,7 +124,6 @@ class UserController extends Controller
         }
 
         if ($request->has('password') && $request->get('password') != '') {
-            //dd('cat');
             $password = $request->get('password');
             $user->password = bcrypt($password);
         }
@@ -137,6 +142,7 @@ class UserController extends Controller
             return $this->currentUser->id == $id;
         });
         $user = $this->user->findOrFail($id);
+        $this->setPageTitle('Delete User ' . $user->name);
         return view('users/delete', ['user' => $user]);
     }
 
@@ -151,7 +157,13 @@ class UserController extends Controller
         $this->checkPermissionOr('user-delete', function () use ($id) {
             return $this->currentUser->id == $id;
         });
-        $user = $this->user->findOrFail($id);
+        $user = $this->userRepo->getById($id);
+        // Delete social accounts
+        if($this->userRepo->isOnlyAdmin($user)) {
+            session()->flash('error', 'You cannot delete the only admin');
+            return redirect($user->getEditUrl());
+        }
+        $user->socialAccounts()->delete();
         $user->delete();
         return redirect('/users');
     }