Updated readme for phpcs usage, aligned gh action workflows

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

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index f02f541bc9ba5b1a9ad14270d900ae053b23900d..f5e48ca4cc5413ae6c6afcbf5fbb091391e6ce6a 100644 (file)
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -1,4 +1,6 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;

 
 use BookStack\Actions\ActivityType;
 use BookStack\Auth\User;
 
 use BookStack\Actions\ActivityType;
 use BookStack\Auth\User;


@@ -7,42 +9,52 @@ use Illuminate\Http\Request;
 
 class SettingController extends Controller
 {
 
 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;
     }
 
     /**

-     * Display a listing of the settings.
+     * Handle requests to the settings index path.

      */
     public function index()
     {
      */
     public function index()
     {

+        return redirect('/settings/features');
+    }
+
+    /**
+     * Display the settings for the given category.
+     */
+    public function category(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' => 'nullable|' . $this->getImageValidationRules(),
+            'app_logo' => array_merge(['nullable'], $this->getImageValidationRules()),

         ]);
 
         // Cycles through posted settings and update them
         ]);
 
         // Cycles through posted settings and update them


@@ -55,7 +67,7 @@ class SettingController extends Controller
         }
 
         // Update logo image if set
         }
 
         // Update logo image if set

-        if ($request->hasFile('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);


@@ -63,15 +75,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');
         }
 

-        $section = $request->get('section', '');
-        $this->logActivity(ActivityType::SETTINGS_UPDATE, $section);
+        $this->logActivity(ActivityType::SETTINGS_UPDATE, $category);

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

-        $redirectLocation = '/settings#' . $section;
-        return redirect(rtrim($redirectLocation, '#'));
+
+        return redirect("/settings/{$category}");
+    }
+
+    protected function ensureCategoryExists(string $category): void
+    {
+        if (!in_array($category, $this->settingCategories)) {
+            abort(404);
+        }

     }
 }
     }
 }