Updated Swedish translation

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

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 63c27fa0b5eeac65911229e03a86ff6dfccf1224..d50baa86f484b59bc14fd491c457d1c86209fd62 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -1,153 +1,265 @@
-<?php
-
-namespace Oxbow\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 

+use Exception;

 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

-
-use Illuminate\Support\Facades\Hash;
-use Oxbow\Http\Requests;
-use Oxbow\User;
+use Illuminate\Http\Response;
+use BookStack\Repos\UserRepo;
+use BookStack\Services\SocialAuthService;
+use BookStack\User;

 
 class UserController extends Controller
 {
 
     protected $user;
 
 class UserController extends Controller
 {
 
     protected $user;

+    protected $userRepo;

 
     /**
      * UserController constructor.
 
     /**
      * 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->user = $user;

+        $this->userRepo = $userRepo;

         parent::__construct();
     }
 
     /**
      * Display a listing of the users.
         parent::__construct();
     }
 
     /**
      * Display a listing of the users.

-     *
+     * @param Request $request

      * @return Response
      */
      * @return Response
      */

-    public function index()
+    public function index(Request $request)

     {
     {

-        $users = $this->user->all();
-        return view('users/index', ['users' => $users]);
+        $this->checkPermission('users-manage');
+        $listDetails = [
+            'order' => $request->get('order', 'asc'),
+            'search' => $request->get('search', ''),
+            'sort' => $request->get('sort', 'name'),
+        ];
+        $users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails);
+        $this->setPageTitle(trans('settings.users'));
+        $users->appends($listDetails);
+        return view('users/index', ['users' => $users, 'listDetails' => $listDetails]);

     }
 
     /**
      * Show the form for creating a new user.
     }
 
     /**
      * Show the form for creating a new user.

-     *

      * @return Response
      */
     public function create()
     {
      * @return Response
      */
     public function create()
     {

-        $this->checkPermission('user-create');
-        return view('users/create');
+        $this->checkPermission('users-manage');
+        $authMethod = config('auth.method');
+        $roles = $this->userRepo->getAllRoles();
+        return view('users/create', ['authMethod' => $authMethod, 'roles' => $roles]);

     }
 
     /**
      * Store a newly created user in storage.
     }
 
     /**
      * Store a newly created user in storage.

-     *

      * @param  Request $request
      * @return Response
      */
     public function store(Request $request)
     {
      * @param  Request $request
      * @return Response
      */
     public function store(Request $request)
     {

-        $this->checkPermission('user-create');
-        $this->validate($request, [
+        $this->checkPermission('users-manage');
+        $validationRules = [

             'name'             => 'required',
             'name'             => 'required',

-            'email'            => 'required|email',
-            'password'         => 'required|min:5',
-            'password-confirm' => 'required|same:password',
-            'role'             => 'required|exists:roles,id'
-        ]);
+            'email'            => 'required|email|unique:users,email'
+        ];
+
+        $authMethod = config('auth.method');
+        if ($authMethod === 'standard') {
+            $validationRules['password'] = 'required|min:5';
+            $validationRules['password-confirm'] = 'required|same:password';
+        } elseif ($authMethod === 'ldap') {
+            $validationRules['external_auth_id'] = 'required';
+        }
+        $this->validate($request, $validationRules);

 
         $user = $this->user->fill($request->all());
 
         $user = $this->user->fill($request->all());

-        $user->password = Hash::make($request->get('password'));
+
+        if ($authMethod === 'standard') {
+            $user->password = bcrypt($request->get('password'));
+        } elseif ($authMethod === 'ldap') {
+            $user->external_auth_id = $request->get('external_auth_id');
+        }
+

         $user->save();
 
         $user->save();
 

-        $user->attachRoleId($request->get('role'));
-        return redirect('/users');
-    }
+        if ($request->filled('roles')) {
+            $roles = $request->get('roles');
+            $user->roles()->sync($roles);
+        }

 
 

+        $this->userRepo->downloadGravatarToUserAvatar($user);
+
+        return redirect('/settings/users');
+    }

 
     /**
      * Show the form for editing the specified user.
 
     /**
      * Show the form for editing the specified user.

-     *
-     * @param  int $id
+     * @param  int              $id
+     * @param SocialAuthService $socialAuthService

      * @return Response
      */
      * @return Response
      */

-    public function edit($id)
+    public function edit($id, SocialAuthService $socialAuthService)

     {
     {

-        $this->checkPermissionOr('user-update', function () use ($id) {
+        $this->checkPermissionOr('users-manage', function () use ($id) {

             return $this->currentUser->id == $id;
         });
             return $this->currentUser->id == $id;
         });

+

         $user = $this->user->findOrFail($id);
         $user = $this->user->findOrFail($id);

-        return view('users/edit', ['user' => $user]);
+
+        $authMethod = ($user->system_name) ? 'system' : config('auth.method');
+
+        $activeSocialDrivers = $socialAuthService->getActiveDrivers();
+        $this->setPageTitle(trans('settings.user_profile'));
+        $roles = $this->userRepo->getAllRoles();
+        return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]);

     }
 
     /**
      * Update the specified user in storage.
     }
 
     /**
      * Update the specified user in storage.

-     *

      * @param  Request $request
      * @param  int     $id
      * @return Response
      */
     public function update(Request $request, $id)
     {
      * @param  Request $request
      * @param  int     $id
      * @return Response
      */
     public function update(Request $request, $id)
     {

-        $this->checkPermissionOr('user-update', function () use ($id) {
+        $this->preventAccessForDemoUsers();
+        $this->checkPermissionOr('users-manage', function () use ($id) {

             return $this->currentUser->id == $id;
         });
             return $this->currentUser->id == $id;
         });

+

         $this->validate($request, [
         $this->validate($request, [

-            'name'             => 'required',
-            'email'            => 'required|email|unique:users,email,' . $id,
-            'password'         => 'min:5',
-            'password-confirm' => 'same:password',
-            'role'             => 'exists:roles,id'
+            'name'             => 'min:2',
+            'email'            => 'min:2|email|unique:users,email,' . $id,
+            'password'         => 'min:5|required_with:password_confirm',
+            'password-confirm' => 'same:password|required_with:password',
+            'setting'          => 'array'

         ]);
 
         $user = $this->user->findOrFail($id);
         $user->fill($request->all());
 
         ]);
 
         $user = $this->user->findOrFail($id);
         $user->fill($request->all());
 

-        if ($this->currentUser->can('user-update') && $request->has('role')) {
-            $user->attachRoleId($request->get('role'));
+        // Role updates
+        if (userCan('users-manage') && $request->filled('roles')) {
+            $roles = $request->get('roles');
+            $user->roles()->sync($roles);

         }
 
         }
 

-        if ($request->has('password') && $request->get('password') != '') {
+        // Password updates
+        if ($request->filled('password')) {

             $password = $request->get('password');
             $password = $request->get('password');

-            $user->password = Hash::make($password);
+            $user->password = bcrypt($password);
+        }
+
+        // External auth id updates
+        if ($this->currentUser->can('users-manage') && $request->filled('external_auth_id')) {
+            $user->external_auth_id = $request->get('external_auth_id');

         }
         }

+
+        // Save an user-specific settings
+        if ($request->filled('setting')) {
+            foreach ($request->get('setting') as $key => $value) {
+                setting()->putUser($user, $key, $value);
+            }
+        }
+

         $user->save();
         $user->save();

-        return redirect('/users');
+        session()->flash('success', trans('settings.users_edit_success'));
+
+        $redirectUrl = userCan('users-manage') ? '/settings/users' : '/settings/users/' . $user->id;
+        return redirect($redirectUrl);

     }
 
     /**
      * Show the user delete page.
     }
 
     /**
      * Show the user delete page.

-     * @param $id
+     * @param int $id

      * @return \Illuminate\View\View
      */
     public function delete($id)
     {
      * @return \Illuminate\View\View
      */
     public function delete($id)
     {

-        $this->checkPermissionOr('user-delete', function () use ($id) {
+        $this->checkPermissionOr('users-manage', function () use ($id) {

             return $this->currentUser->id == $id;
         });
             return $this->currentUser->id == $id;
         });

+

         $user = $this->user->findOrFail($id);
         $user = $this->user->findOrFail($id);

+        $this->setPageTitle(trans('settings.users_delete_named', ['userName' => $user->name]));

         return view('users/delete', ['user' => $user]);
     }
 
     /**
      * Remove the specified user from storage.
         return view('users/delete', ['user' => $user]);
     }
 
     /**
      * Remove the specified user from storage.

-     *

      * @param  int $id
      * @return Response
      */
     public function destroy($id)
     {
      * @param  int $id
      * @return Response
      */
     public function destroy($id)
     {

-        $this->checkPermissionOr('user-delete', function () use ($id) {
+        $this->preventAccessForDemoUsers();
+        $this->checkPermissionOr('users-manage', function () use ($id) {

             return $this->currentUser->id == $id;
         });
             return $this->currentUser->id == $id;
         });

+
+        $user = $this->userRepo->getById($id);
+
+        if ($this->userRepo->isOnlyAdmin($user)) {
+            session()->flash('error', trans('errors.users_cannot_delete_only_admin'));
+            return redirect($user->getEditUrl());
+        }
+
+        if ($user->system_name === 'public') {
+            session()->flash('error', trans('errors.users_cannot_delete_guest'));
+            return redirect($user->getEditUrl());
+        }
+
+        $this->userRepo->destroy($user);
+        session()->flash('success', trans('settings.users_delete_success'));
+
+        return redirect('/settings/users');
+    }
+
+    /**
+     * Show the user profile page
+     * @param $id
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function showProfilePage($id)
+    {
+        $user = $this->userRepo->getById($id);
+        $userActivity = $this->userRepo->getActivity($user);
+        $recentlyCreated = $this->userRepo->getRecentlyCreated($user, 5, 0);
+        $assetCounts = $this->userRepo->getAssetCounts($user);
+        return view('users/profile', [
+            'user' => $user,
+            'activity' => $userActivity,
+            'recentlyCreated' => $recentlyCreated,
+            'assetCounts' => $assetCounts
+        ]);
+    }
+
+    /**
+     * Update the user's preferred book-list display setting.
+     * @param $id
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function switchBookView($id, Request $request)
+    {
+        $this->checkPermissionOr('users-manage', function () use ($id) {
+            return $this->currentUser->id == $id;
+        });
+
+        $viewType = $request->get('book_view_type');
+        if (!in_array($viewType, ['grid', 'list'])) {
+            $viewType = 'list';
+        }
+

         $user = $this->user->findOrFail($id);
         $user = $this->user->findOrFail($id);

-        $user->delete();
-        return redirect('/users');
+        setting()->putUser($user, 'books_view_type', $viewType);
+
+        return redirect()->back(302, [], "/settings/users/$id");

     }
 }
     }
 }