Only output hidden user filters when not set to 'me'

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

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 9a2f2c86797a150bf040c86d4f4ab735bb077eac..895481d02405305c80198541883613941a69a13a 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -18,8 +18,8 @@ use Illuminate\Validation\ValidationException;
 
 class UserController extends Controller
 {
 
 class UserController extends Controller
 {

-    protected $userRepo;
-    protected $imageRepo;
+    protected UserRepo $userRepo;
+    protected ImageRepo $imageRepo;

 
     /**
      * UserController constructor.
 
     /**
      * UserController constructor.


@@ -81,9 +81,9 @@ class UserController extends Controller
         $passwordRequired = ($authMethod === 'standard' && !$sendInvite);
 
         $validationRules = [
         $passwordRequired = ($authMethod === 'standard' && !$sendInvite);
 
         $validationRules = [

-            'name'             => ['required'],
+            'name'             => ['required', 'max:100'],

             'email'            => ['required', 'email', 'unique:users,email'],
             'email'            => ['required', 'email', 'unique:users,email'],

-            'language'         => ['string'],
+            'language'         => ['string', 'max:15', 'alpha_dash'],

             'roles'            => ['array'],
             'roles.*'          => ['integer'],
             'password'         => $passwordRequired ? ['required', Password::default()] : null,
             'roles'            => ['array'],
             'roles.*'          => ['integer'],
             'password'         => $passwordRequired ? ['required', Password::default()] : null,


@@ -139,11 +139,11 @@ class UserController extends Controller
         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
         $validated = $this->validate($request, [
         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
         $validated = $this->validate($request, [

-            'name'             => ['min:2'],
+            'name'             => ['min:2', 'max:100'],

             'email'            => ['min:2', 'email', 'unique:users,email,' . $id],
             'password'         => ['required_with:password_confirm', Password::default()],
             'password-confirm' => ['same:password', 'required_with:password'],
             'email'            => ['min:2', 'email', 'unique:users,email,' . $id],
             'password'         => ['required_with:password_confirm', Password::default()],
             'password-confirm' => ['same:password', 'required_with:password'],

-            'language'         => ['string'],
+            'language'         => ['string', 'max:15', 'alpha_dash'],

             'roles'            => ['array'],
             'roles.*'          => ['integer'],
             'external_auth_id' => ['string'],
             'roles'            => ['array'],
             'roles.*'          => ['integer'],
             'external_auth_id' => ['string'],


@@ -293,7 +293,7 @@ class UserController extends Controller
     {
         $validated = $this->validate($request, [
             'language' => ['required', 'string', 'max:20'],
     {
         $validated = $this->validate($request, [
             'language' => ['required', 'string', 'max:20'],

-            'active' => ['required', 'bool'],
+            'active'   => ['required', 'bool'],

         ]);
 
         $currentFavoritesStr = setting()->getForCurrentUser('code-language-favourites', '');
         ]);
 
         $currentFavoritesStr = setting()->getForCurrentUser('code-language-favourites', '');


@@ -302,7 +302,7 @@ class UserController extends Controller
         $isFav = in_array($validated['language'], $currentFavorites);
         if (!$isFav && $validated['active']) {
             $currentFavorites[] = $validated['language'];
         $isFav = in_array($validated['language'], $currentFavorites);
         if (!$isFav && $validated['active']) {
             $currentFavorites[] = $validated['language'];

-        } else if ($isFav && !$validated['active']) {
+        } elseif ($isFav && !$validated['active']) {

             $index = array_search($validated['language'], $currentFavorites);
             array_splice($currentFavorites, $index, 1);
         }
             $index = array_search($validated['language'], $currentFavorites);
             array_splice($currentFavorites, $index, 1);
         }