Merge pull request #3556 from GongMingCai/development

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

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index 3d1c184cdcebe0acac5ac0ad441b8ef9c00aeb0d..f5e48ca4cc5413ae6c6afcbf5fbb091391e6ce6a 100644 (file)
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -19,9 +19,17 @@ class SettingController extends Controller
     }
 
     /**
     }
 
     /**

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

      */
      */

-    public function index(string $category)
+    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->ensureCategoryExists($category);
         $this->checkPermission('settings-manage');


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

-        if ($category === 'customization' &&  $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');
         }


@@ -75,7 +83,7 @@ class SettingController extends Controller
         $this->logActivity(ActivityType::SETTINGS_UPDATE, $category);
         $this->showSuccessNotification(trans('settings.settings_save_success'));
 
         $this->logActivity(ActivityType::SETTINGS_UPDATE, $category);
         $this->showSuccessNotification(trans('settings.settings_save_success'));
 

-        return redirect("/settings/${category}");
+        return redirect("/settings/{$category}");

     }
 
     protected function ensureCategoryExists(string $category): void
     }
 
     protected function ensureCategoryExists(string $category): void