ZIP Imports: Added API examples, finished testing

[bookstack] / app / Settings / SettingController.php

diff --git a/app/Settings/SettingController.php b/app/Settings/SettingController.php
index bdbc3c78a392dce4bc97b7ae419f586147205b66..3b7ba74d58a8afc0342c59f04b12a3560c78dba8 100644 (file)
--- a/app/Settings/SettingController.php
+++ b/app/Settings/SettingController.php
@@ -3,14 +3,13 @@
 namespace BookStack\Settings;
 
 use BookStack\Activity\ActivityType;
 namespace BookStack\Settings;
 
 use BookStack\Activity\ActivityType;

+use BookStack\App\AppVersion;

 use BookStack\Http\Controller;
 use BookStack\Users\Models\User;
 use Illuminate\Http\Request;
 
 class SettingController extends Controller
 {
 use BookStack\Http\Controller;
 use BookStack\Users\Models\User;
 use Illuminate\Http\Request;
 
 class SettingController extends Controller
 {

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

     /**
      * Handle requests to the settings index path.
      */
     /**
      * Handle requests to the settings index path.
      */


@@ -28,12 +27,9 @@ class SettingController extends Controller
         $this->checkPermission('settings-manage');
         $this->setPageTitle(trans('settings.settings'));
 
         $this->checkPermission('settings-manage');
         $this->setPageTitle(trans('settings.settings'));
 

-        // Get application version
-        $version = trim(file_get_contents(base_path('version')));
-
-        return view('settings.' . $category, [
+        return view('settings.categories.' . $category, [

             'category'  => $category,
             'category'  => $category,

-            'version'   => $version,
+            'version'   => AppVersion::get(),

             'guestUser' => User::getGuest(),
         ]);
     }
             'guestUser' => User::getGuest(),
         ]);
     }


@@ -59,7 +55,7 @@ class SettingController extends Controller
 
     protected function ensureCategoryExists(string $category): void
     {
 
     protected function ensureCategoryExists(string $category): void
     {

-        if (!in_array($category, $this->settingCategories)) {
+        if (!view()->exists('settings.categories.' . $category)) {

             abort(404);
         }
     }
             abort(404);
         }
     }