Rolled tri-layout to page edit and book-create

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

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 397bb2922b6f558a5a2ede8e12c3f6275ccdc1bc..92dc3cdaaa9d00f478c46e72a06b70c9f03d3579 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -1,11 +1,10 @@
 <?php namespace BookStack\Http\Controllers;
 
 <?php namespace BookStack\Http\Controllers;
 

-use Exception;
+use BookStack\Auth\Access\SocialAuthService;
+use BookStack\Auth\User;
+use BookStack\Auth\UserRepo;

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

-use BookStack\Repos\UserRepo;
-use BookStack\Services\SocialAuthService;
-use BookStack\User;

 
 class UserController extends Controller
 {
 
 class UserController extends Controller
 {


@@ -16,7 +15,7 @@ class UserController extends Controller
     /**
      * UserController constructor.
      * @param User     $user
     /**
      * UserController constructor.
      * @param User     $user

-     * @param UserRepo $userRepo
+     * @param \BookStack\Auth\UserRepo $userRepo

      */
     public function __construct(User $user, UserRepo $userRepo)
     {
      */
     public function __construct(User $user, UserRepo $userRepo)
     {


@@ -93,17 +92,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');
     }


@@ -111,7 +100,7 @@ class UserController extends Controller
     /**
      * Show the form for editing the specified user.
      * @param  int              $id
     /**
      * Show the form for editing the specified user.
      * @param  int              $id

-     * @param SocialAuthService $socialAuthService
+     * @param \BookStack\Auth\Access\SocialAuthService $socialAuthService

      * @return Response
      */
     public function edit($id, SocialAuthService $socialAuthService)
      * @return Response
      */
     public function edit($id, SocialAuthService $socialAuthService)


@@ -250,26 +239,91 @@ class UserController extends Controller
         ]);
     }
 
         ]);
     }
 

-    public function switchBookView($id, Request $request) {
-        $this->checkPermissionOr('users-manage', function () use ($id) {
-            return $this->currentUser->id == $id;
-        });
-        $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)
+    {
+        return $this->switchViewType($id, $request, 'books');
+    }

 
 

+    /**
+     * Update the user's preferred shelf-list display setting.
+     * @param $id
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function switchShelfView($id, Request $request)
+    {
+        return $this->switchViewType($id, $request, 'bookshelves');
+    }
+
+    /**
+     * For a type of list, switch with stored view type for a user.
+     * @param integer $userId
+     * @param Request $request
+     * @param string $listName
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    protected function switchViewType($userId, Request $request, string $listName)
+    {
+        $this->checkPermissionOrCurrentUser('users-manage', $userId);
+
+        $viewType = $request->get('view_type');

         if (!in_array($viewType, ['grid', 'list'])) {
             $viewType = 'list';
         }
 
         if (!in_array($viewType, ['grid', 'list'])) {
             $viewType = 'list';
         }
 

-        $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);
+        $user = $this->user->findOrFail($userId);
+        $key = $listName . '_view_type';
+        setting()->putUser($user, $key, $viewType);
+
+        return redirect()->back(302, [], "/settings/users/$userId");
+    }
+
+    /**
+     * Change the stored sort type for the books view.
+     * @param $id
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function changeBooksSort($id, Request $request)
+    {
+        // TODO - Test this endpoint
+        return $this->changeListSort($id, $request, 'books');
+    }
+
+    /**
+     * Changed the stored preference for a list sort order.
+     * @param int $userId
+     * @param Request $request
+     * @param string $listName
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    protected function changeListSort(int $userId, Request $request, string $listName)
+    {
+        $this->checkPermissionOrCurrentUser('users-manage', $userId);
+
+        $sort = $request->get('sort');
+        if (!in_array($sort, ['name', 'created_at', 'updated_at'])) {
+            $sort = 'name';

         }
         }

+
+        $order = $request->get('order');
+        if (!in_array($order, ['asc', 'desc'])) {
+            $order = 'asc';
+        }
+
+        $user = $this->user->findOrFail($userId);
+        $sortKey = $listName . '_sort';
+        $orderKey = $listName . '_sort_order';
+        setting()->putUser($user, $sortKey, $sort);
+        setting()->putUser($user, $orderKey, $order);
+
+        return redirect()->back(302, [], "/settings/users/$userId");

     }
     }

+

 }
 }