Adjusted/improved some color setting wording

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

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index 68687dc9552ac2e39ae9e88fcbd79b5c7f440c64..1e13d7cb77ed4001598f2cb8a85bbde357e7ea6c 100644 (file)
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -1,126 +1,69 @@
-<?php namespace BookStack\Http\Controllers;
+<?php

 
 

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

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

+use BookStack\Settings\AppSettingsStore;

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

-use BookStack\Uploads\ImageService;

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

-use Illuminate\Http\Response;
-use Setting;

 
 class SettingController extends Controller
 {
 
 class SettingController extends Controller
 {

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

 
     /**
 
     /**

-     * SettingController constructor.
-     * @param $imageRepo
+     * Handle requests to the settings index path.

      */
      */

-    public function __construct(ImageRepo $imageRepo)
+    public function index()

     {
     {

-        $this->imageRepo = $imageRepo;
-        parent::__construct();
+        return redirect('/settings/features');

     }
 
     }
 

-

     /**
     /**

-     * Display a listing of the settings.
-     * @return Response
+     * Display the settings for the given category.

      */
      */

-    public function index()
+    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.

-     * @param  Request $request
-     * @return Response

      */
      */

-    public function update(Request $request)
+    public function update(Request $request, AppSettingsStore $store, 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' => ['nullable', ...$this->getImageValidationRules()],
+            'app_icon' => ['nullable', ...$this->getImageValidationRules()],

         ]);
 
         ]);
 

-        // Cycles through posted settings and update them
-        foreach ($request->all() as $name => $value) {
-            if (strpos($name, 'setting-') !== 0) {
-                continue;
-            }
-            $key = str_replace('setting-', '', trim($name));
-            setting()->put($key, $value);
-        }
-
-        // Update logo image if set
-        if ($request->has('app_logo')) {
-            $logoFile = $request->file('app_logo');
-            $this->imageRepo->destroyByType('system');
-            $image = $this->imageRepo->saveNew($logoFile, 'system', 0, null, 86);
-            setting()->put('app-logo', $image->url);
-        }
-
-        // Clear logo image if requested
-        if ($request->get('app_logo_reset', null)) {
-            $this->imageRepo->destroyByType('system');
-            setting()->remove('app-logo');
-        }
-
-        $this->showSuccessNotification( trans('settings.settings_save_success'));
-        return redirect('/settings');
-    }
-
-    /**
-     * Show the page for application maintenance.
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function showMaintenance()
-    {
-        $this->checkPermission('settings-manage');
-        $this->setPageTitle(trans('settings.maint'));
+        $store->storeFromUpdateRequest($request, $category);

 
 

-        // Get application version
-        $version = trim(file_get_contents(base_path('version')));
+        $this->logActivity(ActivityType::SETTINGS_UPDATE, $category);
+        $this->showSuccessNotification(trans('settings.settings_save_success'));

 
 

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

     }
 
     }
 

-    /**
-     * Action to clean-up images in the system.
-     * @param Request $request
-     * @param ImageService $imageService
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    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();

     }
 }
     }
 }