From 09f68fc3ac058be34912c279c7c9bf0f9242d897 Mon Sep 17 00:00:00 2001 From: YoshinoriN Date: Mon, 7 Dec 2020 23:18:34 +0900 Subject: [PATCH] fix(rss): avoid display feed link in HTML if RSS option is disabled --- app/Http/Controllers/IndexController.php | 6 ++++-- app/Http/Controllers/PageController.php | 3 ++- app/Http/Controllers/ViewController.php | 2 ++ resources/views/includes/head.blade.php | 4 +++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php index 5cf57063b4..37e970bbb9 100644 --- a/app/Http/Controllers/IndexController.php +++ b/app/Http/Controllers/IndexController.php @@ -58,12 +58,13 @@ public function show() $menus = Page::menu()->get(); $title = Configs::get_value('site_title', Config::get('defines.defaults.SITE_TITLE')); + $rss_enable = (Configs::get_value('rss_enable', '0') == '1') ? true : false; $page_config = []; $page_config['show_hosted_by'] = false; $page_config['display_socials'] = false; - return view('landing', ['locale' => $lang, 'title' => $title, 'infos' => $infos, 'menus' => $menus, 'page_config' => $page_config]); + return view('landing', ['locale' => $lang, 'title' => $title, 'infos' => $infos, 'menus' => $menus, 'page_config' => $page_config, 'rss_enable' => $rss_enable]); } return $this->gallery(); @@ -103,10 +104,11 @@ public function gallery() $lang['language'] = Configs::get_value('lang'); $title = Configs::get_value('site_title', Config::get('defines.defaults.SITE_TITLE')); + $rss_enable = (Configs::get_value('rss_enable', '0') == '1') ? true : false; $page_config = []; $page_config['show_hosted_by'] = true; $page_config['display_socials'] = Configs::get_value('display_social_in_gallery', '0') == '1'; - return view('gallery', ['locale' => $lang, 'title' => $title, 'infos' => $infos, 'page_config' => $page_config]); + return view('gallery', ['locale' => $lang, 'title' => $title, 'infos' => $infos, 'page_config' => $page_config, 'rss_enable' => $rss_enable]); } } diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 57ec73c356..c91083b5de 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -50,6 +50,7 @@ public function page(Request $request, $page) $infos = $this->configFunctions->get_pages_infos(); $title = Configs::get_value('site_title', Config::get('defines.defaults.SITE_TITLE')); + $rss_enable = (Configs::get_value('rss_enable', '0') == '1') ? true : false; $menus = Page::menu()->get(); $contents = $page->content; @@ -57,7 +58,7 @@ public function page(Request $request, $page) $page_config['show_hosted_by'] = false; $page_config['display_socials'] = false; - return view('page', ['locale' => $lang, 'title' => $title, 'infos' => $infos, 'menus' => $menus, 'contents' => $contents, 'page_config' => $page_config]); + return view('page', ['locale' => $lang, 'title' => $title, 'infos' => $infos, 'menus' => $menus, 'contents' => $contents, 'page_config' => $page_config, 'rss_enable' => $rss_enable]); } /** diff --git a/app/Http/Controllers/ViewController.php b/app/Http/Controllers/ViewController.php index 4ebbfc3ed7..45a20db0f7 100644 --- a/app/Http/Controllers/ViewController.php +++ b/app/Http/Controllers/ViewController.php @@ -64,6 +64,7 @@ public function view(Request $request) } $title = Configs::get_value('site_title', Config::get('defines.defaults.SITE_TITLE')); + $rss_enable = (Configs::get_value('rss_enable', '0') == '1') ? true : false; $url = config('app.url') . $request->server->get('REQUEST_URI'); $picture = config('app.url') . '/uploads/' . $dir . '/' . $photo->url; @@ -73,6 +74,7 @@ public function view(Request $request) 'photo' => $photo, 'picture' => $picture, 'title' => $title, + 'rss_enable' => $rss_enable ]); } } diff --git a/resources/views/includes/head.blade.php b/resources/views/includes/head.blade.php index 19157cfd75..f59c15317d 100644 --- a/resources/views/includes/head.blade.php +++ b/resources/views/includes/head.blade.php @@ -13,6 +13,8 @@ -@include('feed::links') +@if($rss_enable) + @include('feed::links') +@endif @yield('head-meta')