X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/57f587a78b47b23fc646b621628a834833826d69..refs/pull/2791/head:/app/Http/Controllers/SettingController.php diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php index feb6521f3..f02f541bc 100644 --- a/app/Http/Controllers/SettingController.php +++ b/app/Http/Controllers/SettingController.php @@ -1,9 +1,8 @@ imageRepo = $imageRepo; - parent::__construct(); } /** @@ -49,10 +47,10 @@ class SettingController extends Controller // Cycles through posted settings and update them foreach ($request->all() as $name => $value) { + $key = str_replace('setting-', '', trim($name)); if (strpos($name, 'setting-') !== 0) { continue; } - $key = str_replace('setting-', '', trim($name)); setting()->put($key, $value); } @@ -70,67 +68,10 @@ class SettingController extends Controller setting()->remove('app-logo'); } + $section = $request->get('section', ''); + $this->logActivity(ActivityType::SETTINGS_UPDATE, $section); $this->showSuccessNotification(trans('settings.settings_save_success')); - $redirectLocation = '/settings#' . $request->get('section', ''); + $redirectLocation = '/settings#' . $section; return redirect(rtrim($redirectLocation, '#')); } - - /** - * Show the page for application maintenance. - */ - public function showMaintenance() - { - $this->checkPermission('settings-manage'); - $this->setPageTitle(trans('settings.maint')); - - // Get application version - $version = trim(file_get_contents(base_path('version'))); - - return view('settings.maintenance', ['version' => $version]); - } - - /** - * Action to clean-up images in the system. - */ - public function cleanupImages(Request $request, ImageService $imageService) - { - $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 ($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(); - } - - /** - * Action to send a test e-mail to the current user. - */ - public function sendTestEmail() - { - $this->checkPermission('settings-manage'); - - try { - user()->notify(new TestEmail()); - $this->showSuccessNotification(trans('settings.maint_send_test_email_success', ['address' => user()->email])); - } catch (\Exception $exception) { - $errorMessage = trans('errors.maintenance_test_email_failure') . "\n" . $exception->getMessage(); - $this->showErrorNotification($errorMessage); - } - - - return redirect('/settings/maintenance#image-cleanup')->withInput(); - } }