From f3f35f590d980b67f6c91ab6450db8b1784bd254 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 14 Dec 2021 21:46:24 -0700 Subject: [PATCH] Remove admin .env editor --- .../Admin/AdminSettingsController.php | 24 ----- .../views/admin/settings/config.blade.php | 94 ------------------- routes/web.php | 3 - 3 files changed, 121 deletions(-) delete mode 100644 resources/views/admin/settings/config.blade.php diff --git a/app/Http/Controllers/Admin/AdminSettingsController.php b/app/Http/Controllers/Admin/AdminSettingsController.php index 380e7d8a0..c033b769b 100644 --- a/app/Http/Controllers/Admin/AdminSettingsController.php +++ b/app/Http/Controllers/Admin/AdminSettingsController.php @@ -199,30 +199,6 @@ trait AdminSettingsController return view('admin.settings.backups', compact('files')); } - public function settingsConfig(Request $request) - { - $editor = config('pixelfed.admin.env_editor'); - $config = !$editor ? false : file_get_contents(base_path('.env')); - $backup = !$editor ? false : (is_file(base_path('.env.backup')) ? file_get_contents(base_path('.env.backup')) : false); - return view('admin.settings.config', compact('editor', 'config', 'backup')); - } - - public function settingsConfigStore(Request $request) - { - if(config('pixelfed.admin.env_editor') !== true) { - abort(400); - } - return ['msg' => 200]; - } - - public function settingsConfigRestore(Request $request) - { - if(config('pixelfed.admin.env_editor') !== true) { - abort(400); - } - return ['msg' => 200]; - } - public function settingsMaintenance(Request $request) { return view('admin.settings.maintenance'); diff --git a/resources/views/admin/settings/config.blade.php b/resources/views/admin/settings/config.blade.php deleted file mode 100644 index e94b2f787..000000000 --- a/resources/views/admin/settings/config.blade.php +++ /dev/null @@ -1,94 +0,0 @@ -@extends('admin.partial.template') - -@include('admin.settings.sidebar') - -@section('section') -
-

Configuration Settings

- @if($editor == false) -
-
-
-

Configuration Editor is disabled

-

To enable it, add ADMIN_ENV_EDITOR=true to .env
then run php artisan config:cache

-
-
- @else -

Edit configuration settings

-

- Warning: If you have opcache enabled, you may need to restart php for the changes to take effect. -

-
-
-
-
{{$config}}
-
-
- @if($backup) - - @else -
- @endif - -
-
- @endif -@endsection -@if($editor == true) -@push('scripts') - - -@endpush - -@push('styles') - -@endpush -@endif \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index b66f2dda6..76f331545 100644 --- a/routes/web.php +++ b/routes/web.php @@ -47,9 +47,6 @@ Route::domain(config('pixelfed.domain.admin'))->prefix('i/admin')->group(functio Route::get('media/show/{id}', 'AdminController@mediaShow'); Route::get('settings', 'AdminController@settings')->name('admin.settings'); Route::post('settings', 'AdminController@settingsHomeStore'); - Route::get('settings/config', 'AdminController@settingsConfig')->name('admin.settings.config'); - Route::post('settings/config', 'AdminController@settingsConfigStore'); - Route::post('settings/config/restore', 'AdminController@settingsConfigRestore'); Route::get('settings/features', 'AdminController@settingsFeatures')->name('admin.settings.features'); Route::get('settings/pages', 'AdminController@settingsPages')->name('admin.settings.pages'); Route::get('settings/pages/edit', 'PageController@edit')->name('admin.settings.pages.edit');