X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/0774ecc89c23d067296abac0298c2e02120917df..refs/pull/906/head:/app/Http/Controllers/SettingController.php diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php index dfda2b6cf..d9d66042e 100644 --- a/app/Http/Controllers/SettingController.php +++ b/app/Http/Controllers/SettingController.php @@ -1,32 +1,30 @@ -checkPermission('settings-manage'); - $this->setPageTitle('Settings'); - return view('settings/index'); - } + $this->setPageTitle(trans('settings.settings')); + // Get application version + $version = trim(file_get_contents(base_path('version'))); + + return view('settings/index', ['version' => $version]); + } /** * Update the specified settings in storage. - * - * @param Request $request + * @param Request $request * @return Response */ public function update(Request $request) @@ -35,64 +33,59 @@ class SettingController extends Controller $this->checkPermission('settings-manage'); // 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)); - if($key == 'app-color') { - Setting::put('app-color-rgba', $this->hex2rgba($value, 0.15)); + foreach ($request->all() as $name => $value) { + if (strpos($name, 'setting-') !== 0) { + continue; } + $key = str_replace('setting-', '', trim($name)); Setting::put($key, $value); } - session()->flash('success', 'Settings Saved'); + session()->flash('success', trans('settings.settings_save_success')); return redirect('/settings'); } /** - * Adapted from http://mekshq.com/how-to-convert-hexadecimal-color-code-to-rgb-or-rgba-using-php/ - * Converts a hex color code in to an RGBA string. - * - * @param string $color - * @param float|boolean $opacity - * @return boolean|string + * Show the page for application maintenance. + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ - protected function hex2rgba($color, $opacity = false) + public function showMaintenance() { - // Return false if no color provided - if(empty($color)) { - return false; - } - // Trim any whitespace - $color = trim($color); + $this->checkPermission('settings-manage'); + $this->setPageTitle(trans('settings.maint')); - // Sanitize $color if "#" is provided - if($color[0] == '#' ) { - $color = substr($color, 1); - } + // Get application version + $version = trim(file_get_contents(base_path('version'))); - // Check if color has 6 or 3 characters and get values - if(strlen($color) == 6) { - $hex = array( $color[0] . $color[1], $color[2] . $color[3], $color[4] . $color[5] ); - } elseif( strlen( $color ) == 3 ) { - $hex = array( $color[0] . $color[0], $color[1] . $color[1], $color[2] . $color[2] ); - } else { - return false; - } + return view('settings/maintenance', ['version' => $version]); + } + + /** + * 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) + { + $this->checkPermission('settings-manage'); - // Convert hexadec to rgb - $rgb = array_map('hexdec', $hex); + $checkRevisions = !($request->get('ignore_revisions', 'false') === 'true'); + $dryRun = !($request->has('confirm')); - // Check if opacity is set(rgba or rgb) - if($opacity) { - if(abs($opacity) > 1) - $opacity = 1.0; - $output = 'rgba('.implode(",",$rgb).','.$opacity.')'; + $imagesToDelete = $imageService->deleteUnusedImages($checkRevisions, $dryRun); + $deleteCount = count($imagesToDelete); + if ($deleteCount === 0) { + session()->flash('warning', 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 { - $output = 'rgb('.implode(",",$rgb).')'; + session()->flash('success', trans('settings.maint_image_cleanup_success', ['count' => $deleteCount])); } - // Return rgb(a) color string - return $output; + return redirect('/settings/maintenance#image-cleanup')->withInput(); } - }