Added 404 response for non-existing setting categories

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

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index 7f7724468214101cbc443cdee63800d8cbc886e7..3d1c184cdcebe0acac5ac0ad441b8ef9c00aeb0d 100644 (file)
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -1,63 +1,65 @@
-<?php namespace BookStack\Http\Controllers;
+<?php

 
 

+namespace BookStack\Http\Controllers;
+
+use BookStack\Actions\ActivityType;

 use BookStack\Auth\User;
 use BookStack\Auth\User;

-use BookStack\Notifications\TestEmail;

 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageRepo;

-use BookStack\Uploads\ImageService;

 use Illuminate\Http\Request;
 
 class SettingController extends Controller
 {
 use Illuminate\Http\Request;
 
 class SettingController extends Controller
 {

-    protected $imageRepo;
+    protected ImageRepo $imageRepo;
+
+    protected array $settingCategories = ['features', 'customization', 'registration'];

 
 

-    /**
-     * SettingController constructor.
-     */

     public function __construct(ImageRepo $imageRepo)
     {
         $this->imageRepo = $imageRepo;
     public function __construct(ImageRepo $imageRepo)
     {
         $this->imageRepo = $imageRepo;

-        parent::__construct();

     }
 
     /**
      * Display a listing of the settings.
      */
     }
 
     /**
      * Display a listing of the settings.
      */

-    public function index()
+    public function index(string $category)

     {
     {

+        $this->ensureCategoryExists($category);

         $this->checkPermission('settings-manage');
         $this->setPageTitle(trans('settings.settings'));
 
         // Get application version
         $version = trim(file_get_contents(base_path('version')));
 
         $this->checkPermission('settings-manage');
         $this->setPageTitle(trans('settings.settings'));
 
         // Get application version
         $version = trim(file_get_contents(base_path('version')));
 

-        return view('settings.index', [
-            'version' => $version,
-            'guestUser' => User::getDefault()
+        return view('settings.' . $category, [
+            'category'  => $category,
+            'version'   => $version,
+            'guestUser' => User::getDefault(),

         ]);
     }
 
     /**
      * Update the specified settings in storage.
      */
         ]);
     }
 
     /**
      * Update the specified settings in storage.
      */

-    public function update(Request $request)
+    public function update(Request $request, string $category)

     {
     {

+        $this->ensureCategoryExists($category);

         $this->preventAccessInDemoMode();
         $this->checkPermission('settings-manage');
         $this->validate($request, [
         $this->preventAccessInDemoMode();
         $this->checkPermission('settings-manage');
         $this->validate($request, [

-            'app_logo' => $this->imageRepo->getImageValidationRules(),
+            'app_logo' => array_merge(['nullable'], $this->getImageValidationRules()),

         ]);
 
         // Cycles through posted settings and update them
         foreach ($request->all() as $name => $value) {
         ]);
 
         // Cycles through posted settings and update them
         foreach ($request->all() as $name => $value) {

+            $key = str_replace('setting-', '', trim($name));

             if (strpos($name, 'setting-') !== 0) {
                 continue;
             }
             if (strpos($name, 'setting-') !== 0) {
                 continue;
             }

-            $key = str_replace('setting-', '', trim($name));

             setting()->put($key, $value);
         }
 
         // Update logo image if set
             setting()->put($key, $value);
         }
 
         // Update logo image if set

-        if ($request->has('app_logo')) {
+        if ($category === 'customization' && $request->hasFile('app_logo')) {

             $logoFile = $request->file('app_logo');
             $this->imageRepo->destroyByType('system');
             $image = $this->imageRepo->saveNew($logoFile, 'system', 0, null, 86);
             $logoFile = $request->file('app_logo');
             $this->imageRepo->destroyByType('system');
             $image = $this->imageRepo->saveNew($logoFile, 'system', 0, null, 86);


@@ -65,65 +67,21 @@ class SettingController extends Controller
         }
 
         // Clear logo image if requested
         }
 
         // Clear logo image if requested

-        if ($request->get('app_logo_reset', null)) {
+        if ($category === 'customization' &&  $request->get('app_logo_reset', null)) {

             $this->imageRepo->destroyByType('system');
             setting()->remove('app-logo');
         }
 
             $this->imageRepo->destroyByType('system');
             setting()->remove('app-logo');
         }
 

+        $this->logActivity(ActivityType::SETTINGS_UPDATE, $category);

         $this->showSuccessNotification(trans('settings.settings_save_success'));
         $this->showSuccessNotification(trans('settings.settings_save_success'));

-        return redirect('/settings#' . $request->get('section', ''));
-    }
-
-    /**
-     * Show the page for application maintenance.
-     */
-    public function showMaintenance()
-    {
-        $this->checkPermission('settings-manage');
-        $this->setPageTitle(trans('settings.maint'));

 
 

-        // Get application version
-        $version = trim(file_get_contents(base_path('version')));
-
-        return view('settings.maintenance', ['version' => $version]);
+        return redirect("/settings/${category}");

     }
 
     }
 

-    /**
-     * Action to clean-up images in the system.
-     */
-    public function cleanupImages(Request $request, ImageService $imageService)
+    protected function ensureCategoryExists(string $category): void

     {
     {

-        $this->checkPermission('settings-manage');
-
-        $checkRevisions = !($request->get('ignore_revisions', 'false') === 'true');
-        $dryRun = !($request->has('confirm'));
-
-        $imagesToDelete = $imageService->deleteUnusedImages($checkRevisions, $dryRun);
-        $deleteCount = count($imagesToDelete);
-        if ($deleteCount === 0) {
-            $this->showWarningNotification(trans('settings.maint_image_cleanup_nothing_found'));
-            return redirect('/settings/maintenance')->withInput();
+        if (!in_array($category, $this->settingCategories)) {
+            abort(404);

         }
         }

-
-        if ($dryRun) {
-            session()->flash('cleanup-images-warning', trans('settings.maint_image_cleanup_warning', ['count' => $deleteCount]));
-        } else {
-            $this->showSuccessNotification(trans('settings.maint_image_cleanup_success', ['count' => $deleteCount]));
-        }
-
-        return redirect('/settings/maintenance#image-cleanup')->withInput();
-    }
-
-    /**
-     * Action to send a test e-mail to the current user.
-     */
-    public function sendTestEmail()
-    {
-        $this->checkPermission('settings-manage');
-
-        user()->notify(new TestEmail());
-        $this->showSuccessNotification(trans('settings.maint_send_test_email_success', ['address' => user()->email]));
-
-        return redirect('/settings/maintenance#image-cleanup')->withInput();

     }
 }
     }
 }