From a30b7b6259525f3c9eb7bc68cb50549b9a7f05d9 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Mon, 19 Jun 2023 02:16:42 +0900 Subject: [PATCH] Normalize whitespace in RSS module --- modules/rss/rss.admin.controller.php | 48 ++++++++++++++-------------- modules/rss/rss.admin.view.php | 16 +++++----- modules/rss/rss.class.php | 28 ++++++++-------- modules/rss/rss.controller.php | 12 +++---- modules/rss/rss.model.php | 10 +++--- modules/rss/rss.view.php | 42 ++++++++++++------------ 6 files changed, 78 insertions(+), 78 deletions(-) diff --git a/modules/rss/rss.admin.controller.php b/modules/rss/rss.admin.controller.php index 48557238e..87a449a3a 100644 --- a/modules/rss/rss.admin.controller.php +++ b/modules/rss/rss.admin.controller.php @@ -10,7 +10,7 @@ class rssAdminController extends rss function init() { } - + /** * configuration */ @@ -18,7 +18,7 @@ class rssAdminController extends rss { $vars = Context::getRequestVars(); $config = getModel('rss')->getConfig(); - + if($img_file = $vars->image) { // Delete image file @@ -26,22 +26,22 @@ class rssAdminController extends rss { FileHandler::removeFile($config->image); } - + $vars->image = ''; - + // Upload image file if($img_file['tmp_name'] && is_uploaded_file($img_file['tmp_name'])) { $path = 'files/attach/images/rss'; $file_ext = strtolower(array_pop(explode('.', $img_file['name']))); $file_name = sprintf('%s/feed_image.%s', $path, $file_ext); - + // If file exists, delete if(file_exists($file_name)) { FileHandler::removeFile($file_name); } - + // Check image file extension if(!in_array($file_ext, array('jpg', 'jpeg', 'gif', 'png'))) { @@ -59,7 +59,7 @@ class rssAdminController extends rss } } } - + if(!in_array($vars->use_total_feed, array('Y','N'))) { $vars->open_rss = 'Y'; @@ -69,9 +69,9 @@ class rssAdminController extends rss { $vars->feed_document_count = 20; } - + getController('module')->updateModuleConfig('rss', $vars); - + if(isset($msg['error'])) { throw new Rhymix\Framework\Exception($msg['error']); @@ -80,17 +80,17 @@ class rssAdminController extends rss { $this->setMessage(isset($msg) ? $msg : 'success_updated'); } - + $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispRssAdminIndex')); } - + /** * Part configuration */ function procRssAdminInsertModuleConfig() { $vars = Context::getRequestVars(); - + if($vars->target_module_srl) { $target_module_srls = explode(',', $vars->target_module_srl); @@ -99,19 +99,19 @@ class rssAdminController extends rss { $target_module_srls = array_keys($vars->open_rss ?: []); } - + if(!count($target_module_srls)) { throw new Rhymix\Framework\Exceptions\InvalidRequest; } - + foreach($target_module_srls as $module_srl) { if(!$module_srl = intval($module_srl)) { continue; } - + $config = new stdClass; if(isset($vars->open_rss[$module_srl])) { @@ -126,7 +126,7 @@ class rssAdminController extends rss $config->feed_description = $vars->feed_description; $config->feed_copyright = $vars->feed_copyright; } - + if(!in_array($config->open_rss, array('Y', 'H', 'N'))) { $config->open_rss = 'N'; @@ -135,14 +135,14 @@ class rssAdminController extends rss { $config->open_total_feed = 'T_N'; } - + getController('module')->updateModulePartConfig('rss', $module_srl, $config); } $this->setMessage('success_updated'); $this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispRssAdminIndex')); } - + function procRssAdminDeleteFeedImage() { $config = getModel('rss')->getConfig(); @@ -150,13 +150,13 @@ class rssAdminController extends rss { throw new Rhymix\Framework\Exceptions\InvalidRequest; } - + FileHandler::removeFile($config->image); - + $config->image = ''; getController('module')->insertModuleConfig('rss', $config); } - + /** * Compatible function */ @@ -165,7 +165,7 @@ class rssAdminController extends rss getController('module')->insertModuleConfig('rss', $config); return new BaseObject(); } - + /** * Compatible function */ @@ -174,7 +174,7 @@ class rssAdminController extends rss $config = new stdClass; $config->open_rss = $open_rss; $config->open_total_feed = $open_total_feed; - + if($feed_description != 'N') { $config->feed_description = $feed_description; @@ -183,7 +183,7 @@ class rssAdminController extends rss { $config->feed_copyright = $feed_copyright; } - + getController('module')->insertModulePartConfig('rss', $module_srl, $config); return new BaseObject(); } diff --git a/modules/rss/rss.admin.view.php b/modules/rss/rss.admin.view.php index 25215b7cf..57c14f11b 100644 --- a/modules/rss/rss.admin.view.php +++ b/modules/rss/rss.admin.view.php @@ -10,14 +10,14 @@ class rssAdminView extends rss function init() { Context::set('config', getModel('rss')->getConfig()); - + $this->setTemplatePath($this->module_path . 'tpl'); } - + function dispRssAdminIndex() { $oRssModel = getModel('rss'); - + $rss_list = array(); foreach (ModuleModel::getMidList((object)['module' => 'board']) as $module_info) { @@ -27,26 +27,26 @@ class rssAdminView extends rss $args->open_feed = 'N'; $args->open_total_feed = 'N'; $args->feed_description = ''; - + $rss_list[$module_info->module_srl] = $args; } - + foreach (ModuleModel::getModulePartConfigs('rss') as $module_srl => $module_config) { $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl); - + $args = new stdClass; $args->mid = $module_info->mid; $args->url = $oRssModel->getRssURL('rss', $module_info->mid); $args->open_feed = $module_config->open_rss; $args->open_total_feed = $module_config->open_total_feed; $args->feed_description = $module_config->feed_description; - + $rss_list[$module_srl] = $args; } Context::set('rss_list', $rss_list); Context::set('general_rss_url', $oRssModel->getRssURL('rss')); - + $this->setTemplateFile('rss_admin_index'); } } diff --git a/modules/rss/rss.class.php b/modules/rss/rss.class.php index ab464c433..3ac45ef6d 100644 --- a/modules/rss/rss.class.php +++ b/modules/rss/rss.class.php @@ -12,19 +12,19 @@ class rss extends ModuleObject array('rss', 'view', 'rss'), array('rss', 'view', 'atom'), ); - + // Add triggers protected static $add_triggers = array( array('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after'), array('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before'), array('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after'), ); - + // Remove triggers protected static $remove_triggers = array( array('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before'), ); - + /** * Install */ @@ -32,14 +32,14 @@ class rss extends ModuleObject { $this->moduleUpdate(); } - + /** * Check update */ function checkUpdate() { $oModuleModel = getModel('module'); - + // Check forwards for add foreach(self::$add_forwards as $forward) { @@ -48,7 +48,7 @@ class rss extends ModuleObject return true; } } - + // Check triggers for add foreach(self::$add_triggers as $trigger) { @@ -57,7 +57,7 @@ class rss extends ModuleObject return true; } } - + // Check triggers for remove foreach(self::$remove_triggers as $trigger) { @@ -66,10 +66,10 @@ class rss extends ModuleObject return true; } } - + return false; } - + /** * Update */ @@ -77,7 +77,7 @@ class rss extends ModuleObject { $oModuleModel = getModel('module'); $oModuleController = getController('module'); - + // Add forwards foreach(self::$add_forwards as $forward) { @@ -86,7 +86,7 @@ class rss extends ModuleObject $oModuleController->insertActionForward($forward[0], $forward[1], $forward[2]); } } - + // Add triggers foreach(self::$add_triggers as $trigger) { @@ -95,7 +95,7 @@ class rss extends ModuleObject $oModuleController->insertTrigger($trigger[0], $trigger[1], $trigger[2], $trigger[3], $trigger[4]); } } - + // Remove triggers foreach(self::$remove_triggers as $trigger) { @@ -105,10 +105,10 @@ class rss extends ModuleObject } } } - + function recompileCache() { - + } } /* End of file rss.class.php */ diff --git a/modules/rss/rss.controller.php b/modules/rss/rss.controller.php index 6111395de..b49266a6d 100644 --- a/modules/rss/rss.controller.php +++ b/modules/rss/rss.controller.php @@ -10,7 +10,7 @@ class rssController extends rss function init() { } - + /** * Set RSS URL */ @@ -21,31 +21,31 @@ class rssController extends rss { return; } - + $oRssModel = getModel('rss'); $config = $oRssModel->getConfig(); $module_config = $oRssModel->getRssModuleConfig($current_module_srl); - + if($config->use_total_feed != 'N' && Context::get('site_module_info')->mid == Context::get('mid')) { Context::set('general_rss_url', $oRssModel->getRssURL('rss')); Context::set('general_atom_url', $oRssModel->getRssURL('atom')); } - + if($module_config->open_rss != 'N') { Context::set('rss_url', $oRssModel->getRssURL('rss', Context::get('mid'))); Context::set('atom_url', $oRssModel->getRssURL('atom', Context::get('mid'))); } } - + /** * Copy RSS configuration */ function triggerCopyModule(&$obj) { $module_config = getModel('rss')->getRssModuleConfig($obj->originModuleSrl); - + foreach($obj->moduleSrlList as $module_srl) { getController('module')->insertModulePartConfig('rss', $module_srl, $module_config); diff --git a/modules/rss/rss.model.php b/modules/rss/rss.model.php index a983dbf89..3f41c7cde 100644 --- a/modules/rss/rss.model.php +++ b/modules/rss/rss.model.php @@ -11,7 +11,7 @@ class rssModel extends rss { return getFullUrl('', 'mid', $mid, 'act', $format); } - + function getConfig() { $config = getModel('module')->getModuleConfig('rss') ?: new stdClass; @@ -21,20 +21,20 @@ class rssModel extends rss { $config->image_url = $config->image . '?' . date('YmdHis', filemtime($config->image)); } - + return $config; } - + function getRssModuleConfig($module_srl) { $config = getModel('module')->getModulePartConfig('rss', $module_srl) ?: new stdClass; $config->module_srl = $module_srl; $config->open_rss = $config->open_rss ?? 'N'; $config->open_total_feed = $config->open_total_feed ?? 'N'; - + return $config; } - + /** * Compatible function */ diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php index 0ae93c471..5b1f7053b 100644 --- a/modules/rss/rss.view.php +++ b/modules/rss/rss.view.php @@ -9,11 +9,11 @@ class rssView extends rss { // Disable gzhandler public $gzhandler_enable = false; - + function init() { } - + function rss($document_list = null, $rss_title = null, $add_description = null) { $obj = new stdClass; @@ -22,12 +22,12 @@ class rssView extends rss $obj->document_list = $document_list; $this->output(Context::get('format'), $obj); } - + function atom() { $this->output('atom'); } - + function dispError($module_srl = null) { $obj = new stdClass; @@ -36,7 +36,7 @@ class rssView extends rss $obj->description = lang('msg_rss_is_disabled'); $this->output(Context::get('format'), $obj); } - + /** * Feed output */ @@ -46,7 +46,7 @@ class rssView extends rss { $obj = new stdClass; } - + $act = Context::get('act'); $page = $obj->page ?: Context::get('page'); $start = $obj->start_date ?: Context::get('start_date'); @@ -55,7 +55,7 @@ class rssView extends rss $current_module_srl = Context::get('current_module_info')->module_srl; $target_module_srl = isset($obj->module_srl) ? $obj->module_srl : ($current_module_srl ?: $site_module_srl); $is_part_feed = (isset($obj->module_srl) || $target_module_srl !== $site_module_srl) ? true : false; - + // Set format switch($format) { @@ -76,17 +76,17 @@ class rssView extends rss $template = 'rss20'; break; } - + $oRssModel = getModel('rss'); $config = $oRssModel->getConfig(); $module_config = $oRssModel->getRssModuleConfig($target_module_srl); $module_info = getModel('module')->getModuleInfoByModuleSrl($target_module_srl); - + // Get URL $format = ($act != $format) ? $format : ''; $mid = $is_part_feed ? $module_info->mid : ''; $channel_url = getFullUrl('', 'mid', $mid, 'act', $act, 'format', $format, 'page', $page, 'start_date', $start, 'end_date', $end); - + // Check error if($obj->error) { @@ -100,7 +100,7 @@ class rssView extends rss { return $this->dispError(); } - + // Set target module $target_modules = array(); if($is_part_feed) @@ -123,7 +123,7 @@ class rssView extends rss } } Context::set('target_modules', $target_modules); - + // Set document list $document_list = $obj->document_list; if(!is_array($document_list)) @@ -132,7 +132,7 @@ class rssView extends rss { return $this->dispError($module_info->module_srl); } - + $args = new stdClass; $args->start_date = $start; $args->end_date = $end; @@ -146,7 +146,7 @@ class rssView extends rss $document_list = getModel('document')->getDocumentList($args)->data; } Context::set('document_list', $document_list); - + // Set category list $category_list = array(); foreach($target_modules as $module_srl => $open_rss) @@ -155,7 +155,7 @@ class rssView extends rss } Context::set('category_list', $category_list); } - + // Set feed information $info = new stdClass; if($is_part_feed) @@ -172,7 +172,7 @@ class rssView extends rss $info->description = $config->feed_description; $info->feed_copyright = $config->feed_copyright; } - + $info->id = $channel_url; $info->feed_title = $config->feed_title; $info->title = Context::replaceUserLang($obj->title ?: $info->title); @@ -182,15 +182,15 @@ class rssView extends rss $info->date_r = date('r'); $info->date_c = date('c'); $info->image = $config->image ? Context::getRequestUri() . $config->image : ''; - + Context::set('info', $info); - + // Set XML Output Context::setResponseMethod('RAW', 'text/xml'); $this->setTemplatePath($this->module_path . 'tpl/format'); $this->setTemplateFile($template); } - + /** * Additional configurations for a service module */ @@ -203,10 +203,10 @@ class rssView extends rss return; } } - + // Get part configuration Context::set('module_config', getModel('rss')->getRssModuleConfig($current_module_srl)); - + // Add output after compile template $output .= TemplateHandler::getInstance()->compile($this->module_path . 'tpl', 'rss_module_config'); }