Added ability to configure email sender name

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

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 5c10133a2cbe1aa6c4a2cf3e6cfd86777bfb0c01..d50baa86f484b59bc14fd491c457d1c86209fd62 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -93,17 +93,7 @@ class UserController extends Controller
             $user->roles()->sync($roles);
         }
 
             $user->roles()->sync($roles);
         }
 

-        // Get avatar from gravatar and save
-        if (!config('services.disable_services')) {
-            try {
-                $avatar = \Images::saveUserGravatar($user);
-                $user->avatar()->associate($avatar);
-                $user->save();
-            } catch (Exception $e) {
-                \Log::error('Failed to save user gravatar image');
-            }
-
-        }
+        $this->userRepo->downloadGravatarToUserAvatar($user);

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


@@ -250,10 +240,19 @@ class UserController extends Controller
         ]);
     }
 
         ]);
     }
 

-    public function switchBookView($id, Request $request) {
-        $this->checkPermission('users-manage');
-        $viewType = $request->get('book_view_type');
+    /**
+     * 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';
         }
         if (!in_array($viewType, ['grid', 'list'])) {
             $viewType = 'list';
         }


@@ -261,13 +260,6 @@ class UserController extends Controller
         $user = $this->user->findOrFail($id);
         setting()->putUser($user, 'books_view_type', $viewType);
 
         $user = $this->user->findOrFail($id);
         setting()->putUser($user, 'books_view_type', $viewType);
 

-        $previousUrl = url()->previous();
-        if (empty($previousUrl)) {
-            // if no previous URL, redirect to settings
-            return redirect("/settings/users/$id");
-        } else {
-            // redirect to the previous page.
-            return redirect($previousUrl);
-        }
+        return redirect()->back(302, [], "/settings/users/$id");

     }
 }
     }
 }