From 9b794c6df2eb25230d31274cdd6c263e69250363 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Fri, 31 Dec 2021 01:32:00 +0900 Subject: [PATCH] Fix #1828 increase range of RSS document count and set sensible defaults --- modules/rss/rss.admin.controller.php | 6 +++++- modules/rss/rss.view.php | 2 +- modules/rss/tpl/rss_admin_index.html | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/rss/rss.admin.controller.php b/modules/rss/rss.admin.controller.php index 205691fa9..48557238e 100644 --- a/modules/rss/rss.admin.controller.php +++ b/modules/rss/rss.admin.controller.php @@ -64,7 +64,11 @@ class rssAdminController extends rss { $vars->open_rss = 'Y'; } - $vars->feed_document_count = (int) $vars->feed_document_count; + $vars->feed_document_count = intval($vars->feed_document_count); + if ($vars->feed_document_count < 1 || $vars->feed_document_count > 1000) + { + $vars->feed_document_count = 20; + } getController('module')->updateModuleConfig('rss', $vars); diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php index ce90ed3de..0ae93c471 100644 --- a/modules/rss/rss.view.php +++ b/modules/rss/rss.view.php @@ -140,7 +140,7 @@ class rssView extends rss $args->search_keyword = 'N'; $args->page = $page > 0 ? $page : 1; $args->module_srl = array_keys($target_modules); - $args->list_count = $config->feed_document_count; + $args->list_count = $config->feed_document_count > 0 ? $config->feed_document_count : 20; $args->sort_index = 'regdate'; $args->order_type = 'desc'; $document_list = getModel('document')->getDocumentList($args)->data; diff --git a/modules/rss/tpl/rss_admin_index.html b/modules/rss/tpl/rss_admin_index.html index e661b8a07..eceba21df 100644 --- a/modules/rss/tpl/rss_admin_index.html +++ b/modules/rss/tpl/rss_admin_index.html @@ -59,7 +59,7 @@
- +