fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-05 09:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Clean up RSS module

Browse source
This commit is contained in:
Kijin Sung 2023-06-19 02:22:29 +09:00
parent a30b7b6259
commit 01fd0e9cc5
3 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/rss/rss.controller.php
View file

@ -22,20 +22,19 @@ class rssController extends rss
return;
}
$oRssModel = getModel('rss');
$config = $oRssModel->getConfig();
$module_config = $oRssModel->getRssModuleConfig($current_module_srl);
$config = rssModel::getConfig();
$module_config = rssModel::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'));
Context::set('general_rss_url', rssModel::getRssUrl('rss'));
Context::set('general_atom_url', rssModel::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')));
Context::set('rss_url', rssModel::getRssUrl('rss', Context::get('mid')));
Context::set('atom_url', rssModel::getRssUrl('atom', Context::get('mid')));
}
}
@ -44,11 +43,11 @@ class rssController extends rss
*/
function triggerCopyModule(&$obj)
{
$module_config = getModel('rss')->getRssModuleConfig($obj->originModuleSrl);
$module_config = rssModel::getRssModuleConfig($obj->originModuleSrl);
foreach($obj->moduleSrlList as $module_srl)
{
getController('module')->insertModulePartConfig('rss', $module_srl, $module_config);
ModuleController::getInstance()->insertModulePartConfig('rss', $module_srl, $module_config);
}
}
}

12
modules/rss/rss.model.php
View file

@ -7,14 +7,14 @@
*/
class rssModel extends rss
{
function getRssURL($format = 'rss', $mid = '')
public static function getRssURL($format = 'rss', $mid = '')
{
return getFullUrl('', 'mid', $mid, 'act', $format);
}
function getConfig()
public static function getConfig()
{
$config = getModel('module')->getModuleConfig('rss') ?: new stdClass;
$config = ModuleModel::getModuleConfig('rss') ?: new stdClass;
$config->use_total_feed = $config->use_total_feed ?? 'Y';
$config->feed_document_count = intval($config->feed_document_count ?? 15) ?: 15;
if (isset($config->image) && $config->image)
@ -25,9 +25,9 @@ class rssModel extends rss
return $config;
}
function getRssModuleConfig($module_srl)
public static function getRssModuleConfig($module_srl)
{
$config = getModel('module')->getModulePartConfig('rss', $module_srl) ?: new stdClass;
$config = ModuleModel::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';
@ -38,7 +38,7 @@ class rssModel extends rss
/**
* Compatible function
*/
function getModuleFeedUrl($vid, $mid, $format = 'rss', $absolute_url = false)
public static function getModuleFeedUrl($vid, $mid, $format = 'rss', $absolute_url = false)
{
if($absolute_url)
{

15
modules/rss/rss.view.php
View file

@ -77,10 +77,9 @@ class rssView extends rss
break;
}
$oRssModel = getModel('rss');
$config = $oRssModel->getConfig();
$module_config = $oRssModel->getRssModuleConfig($target_module_srl);
$module_info = getModel('module')->getModuleInfoByModuleSrl($target_module_srl);
$config = rssModel::getConfig();
$module_config = rssModel::getRssModuleConfig($target_module_srl);
$module_info = ModuleModel::getModuleInfoByModuleSrl($target_module_srl);
// Get URL
$format = ($act != $format) ? $format : '';
@ -113,7 +112,7 @@ class rssView extends rss
// total feed
elseif($config->use_total_feed == 'Y')
{
foreach(getModel('module')->getModulePartConfigs('rss') as $module_srl => $part_config)
foreach(ModuleModel::getModulePartConfigs('rss') as $module_srl => $part_config)
{
if($part_config->open_rss == 'N' || $part_config->open_total_feed == 'T_N')
{
@ -143,7 +142,7 @@ class rssView extends rss
$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;
$document_list = DocumentModel::getDocumentList($args)->data;
}
Context::set('document_list', $document_list);
@ -151,7 +150,7 @@ class rssView extends rss
$category_list = array();
foreach($target_modules as $module_srl => $open_rss)
{
$category_list[$module_srl] = getModel('document')->getCategoryList($module_srl);
$category_list[$module_srl] = DocumentModel::getCategoryList($module_srl);
}
Context::set('category_list', $category_list);
}
@ -205,7 +204,7 @@ class rssView extends rss
}
// Get part configuration
Context::set('module_config', getModel('rss')->getRssModuleConfig($current_module_srl));
Context::set('module_config', rssModel::getRssModuleConfig($current_module_srl));
// Add output after compile template
$output .= TemplateHandler::getInstance()->compile($this->module_path . 'tpl', 'rss_module_config');