Update some postpositional particles

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

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index c9d2560ba0fff4cf9cb4360579ad71c3afd1c591..b55398d2f6f644cb35cec75383df75be9dd40b71 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -8,6 +8,7 @@ use BookStack\Exceptions\UserUpdateException;
 use BookStack\Uploads\ImageRepo;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use BookStack\Uploads\ImageRepo;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;

+use Illuminate\Support\Str;

 
 class UserController extends Controller
 {
 
 class UserController extends Controller
 {


@@ -92,7 +93,7 @@ class UserController extends Controller
         $user = $this->user->fill($request->all());
 
         if ($authMethod === 'standard') {
         $user = $this->user->fill($request->all());
 
         if ($authMethod === 'standard') {

-            $user->password = bcrypt($request->get('password', str_random(32)));
+            $user->password = bcrypt($request->get('password', Str::random(32)));

         } elseif ($authMethod === 'ldap') {
             $user->external_auth_id = $request->get('external_auth_id');
         }
         } elseif ($authMethod === 'ldap') {
             $user->external_auth_id = $request->get('external_auth_id');
         }


@@ -143,7 +144,7 @@ class UserController extends Controller
      */
     public function update(Request $request, $id)
     {
      */
     public function update(Request $request, $id)
     {

-        $this->preventAccessForDemoUsers();
+        $this->preventAccessInDemoMode();

         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
         $this->validate($request, [
         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
         $this->validate($request, [


@@ -176,7 +177,7 @@ class UserController extends Controller
         }
 
         // External auth id updates
         }
 
         // External auth id updates

-        if ($this->currentUser->can('users-manage') && $request->filled('external_auth_id')) {
+        if (user()->can('users-manage') && $request->filled('external_auth_id')) {

             $user->external_auth_id = $request->get('external_auth_id');
         }
 
             $user->external_auth_id = $request->get('external_auth_id');
         }
 


@@ -201,7 +202,7 @@ class UserController extends Controller
         }
 
         $user->save();
         }
 
         $user->save();

-        session()->flash('success', trans('settings.users_edit_success'));
+        $this->showSuccessNotification(trans('settings.users_edit_success'));

 
         $redirectUrl = userCan('users-manage') ? '/settings/users' : ('/settings/users/' . $user->id);
         return redirect($redirectUrl);
 
         $redirectUrl = userCan('users-manage') ? '/settings/users' : ('/settings/users/' . $user->id);
         return redirect($redirectUrl);


@@ -229,23 +230,23 @@ class UserController extends Controller
      */
     public function destroy($id)
     {
      */
     public function destroy($id)
     {

-        $this->preventAccessForDemoUsers();
+        $this->preventAccessInDemoMode();

         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
         $user = $this->userRepo->getById($id);
 
         if ($this->userRepo->isOnlyAdmin($user)) {
         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
         $user = $this->userRepo->getById($id);
 
         if ($this->userRepo->isOnlyAdmin($user)) {

-            session()->flash('error', trans('errors.users_cannot_delete_only_admin'));
+            $this->showErrorNotification(trans('errors.users_cannot_delete_only_admin'));

             return redirect($user->getEditUrl());
         }
 
         if ($user->system_name === 'public') {
             return redirect($user->getEditUrl());
         }
 
         if ($user->system_name === 'public') {

-            session()->flash('error', trans('errors.users_cannot_delete_guest'));
+            $this->showErrorNotification(trans('errors.users_cannot_delete_guest'));

             return redirect($user->getEditUrl());
         }
 
         $this->userRepo->destroy($user);
             return redirect($user->getEditUrl());
         }
 
         $this->userRepo->destroy($user);

-        session()->flash('success', trans('settings.users_delete_success'));
+        $this->showSuccessNotification(trans('settings.users_delete_success'));

 
         return redirect('/settings/users');
     }
 
         return redirect('/settings/users');
     }


@@ -260,7 +261,7 @@ class UserController extends Controller
         $user = $this->userRepo->getById($id);
 
         $userActivity = $this->userRepo->getActivity($user);
         $user = $this->userRepo->getById($id);
 
         $userActivity = $this->userRepo->getActivity($user);

-        $recentlyCreated = $this->userRepo->getRecentlyCreated($user, 5, 0);
+        $recentlyCreated = $this->userRepo->getRecentlyCreated($user, 5);

         $assetCounts = $this->userRepo->getAssetCounts($user);
 
         return view('users.profile', [
         $assetCounts = $this->userRepo->getAssetCounts($user);
 
         return view('users.profile', [


@@ -273,22 +274,22 @@ class UserController extends Controller
 
     /**
      * Update the user's preferred book-list display setting.
 
     /**
      * Update the user's preferred book-list display setting.

-     * @param $id

      * @param Request $request
      * @param Request $request

+     * @param $id

      * @return \Illuminate\Http\RedirectResponse
      */
      * @return \Illuminate\Http\RedirectResponse
      */

-    public function switchBookView($id, Request $request)
+    public function switchBookView(Request $request, $id)

     {
         return $this->switchViewType($id, $request, 'books');
     }
 
     /**
      * Update the user's preferred shelf-list display setting.
     {
         return $this->switchViewType($id, $request, 'books');
     }
 
     /**
      * Update the user's preferred shelf-list display setting.

-     * @param $id

      * @param Request $request
      * @param Request $request

+     * @param $id

      * @return \Illuminate\Http\RedirectResponse
      */
      * @return \Illuminate\Http\RedirectResponse
      */

-    public function switchShelfView($id, Request $request)
+    public function switchShelfView(Request $request, $id)

     {
         return $this->switchViewType($id, $request, 'bookshelves');
     }
     {
         return $this->switchViewType($id, $request, 'bookshelves');
     }


@@ -318,12 +319,12 @@ class UserController extends Controller
 
     /**
      * Change the stored sort type for a particular view.
 
     /**
      * Change the stored sort type for a particular view.

+     * @param Request $request

      * @param string $id
      * @param string $type
      * @param string $id
      * @param string $type

-     * @param Request $request

      * @return \Illuminate\Http\RedirectResponse
      */
      * @return \Illuminate\Http\RedirectResponse
      */

-    public function changeSort(string $id, string $type, Request $request)
+    public function changeSort(Request $request, string $id, string $type)

     {
         $validSortTypes = ['books', 'bookshelves'];
         if (!in_array($type, $validSortTypes)) {
     {
         $validSortTypes = ['books', 'bookshelves'];
         if (!in_array($type, $validSortTypes)) {


@@ -334,12 +335,12 @@ class UserController extends Controller
 
     /**
      * Update the stored section expansion preference for the given user.
 
     /**
      * Update the stored section expansion preference for the given user.

+     * @param Request $request

      * @param string $id
      * @param string $key
      * @param string $id
      * @param string $key

-     * @param Request $request

      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response
      */
      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response
      */

-    public function updateExpansionPreference(string $id, string $key, Request $request)
+    public function updateExpansionPreference(Request $request, string $id, string $key)

     {
         $this->checkPermissionOrCurrentUser('users-manage', $id);
         $keyWhitelist = ['home-details'];
     {
         $this->checkPermissionOrCurrentUser('users-manage', $id);
         $keyWhitelist = ['home-details'];