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

Clean up references to WidgetModel and others

Browse source
This commit is contained in:
Kijin Sung 2025-05-26 22:54:35 +09:00
parent 14dbac7890
commit da584bb40c
3 changed files with 18 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/admin/controllers/ServerEnv.php
View file

@ -175,13 +175,12 @@ class ServerEnv extends Base
// Widgets // Widgets
$info[] = '[Widgets]'; $info[] = '[Widgets]';
$info['widget'] = array(); $info['widget'] = array();
$oWidgetModel = WidgetModel::getInstance(); $widget_list = WidgetModel::getDownloadedWidgetList() ?: array();
$widget_list = $oWidgetModel->getDownloadedWidgetList() ?: array();
foreach ($widget_list as $widget) foreach ($widget_list as $widget)
{ {
if (!in_array($widget->widget, $skip['widget'])) if (!in_array($widget->widget, $skip['widget']))
{ {
$widgetInfo = $oWidgetModel->getWidgetInfo($widget->widget); $widgetInfo = WidgetModel::getWidgetInfo($widget->widget);
if ($widgetInfo->version === 'RX_VERSION') if ($widgetInfo->version === 'RX_VERSION')
{ {
$info['widget'][] = $widget->widget; $info['widget'][] = $widget->widget;
@ -198,13 +197,12 @@ class ServerEnv extends Base
// Widgetstyles // Widgetstyles
$info[] = '[Widgetstyles]'; $info[] = '[Widgetstyles]';
$info['widgetstyle'] = array(); $info['widgetstyle'] = array();
$oWidgetModel = WidgetModel::getInstance(); $widgetstyle_list = WidgetModel::getDownloadedWidgetStyleList() ?: array();
$widgetstyle_list = $oWidgetModel->getDownloadedWidgetStyleList() ?: array();
foreach ($widgetstyle_list as $widgetstyle) foreach ($widgetstyle_list as $widgetstyle)
{ {
if (!in_array($widgetstyle->widgetStyle, $skip['widgetstyle'])) if (!in_array($widgetstyle->widgetStyle, $skip['widgetstyle']))
{ {
$widgetstyleInfo = $oWidgetModel->getWidgetStyleInfo($widgetstyle->widgetStyle); $widgetstyleInfo = WidgetModel::getWidgetStyleInfo($widgetstyle->widgetStyle);
if ($widgetstyleInfo->version === 'RX_VERSION') if ($widgetstyleInfo->version === 'RX_VERSION')
{ {
$info['widgetstyle'][] = $widgetstyle->widgetStyle; $info['widgetstyle'][] = $widgetstyle->widgetStyle;

3
modules/module/module.model.php
View file

@ -2421,8 +2421,7 @@ class ModuleModel extends Module
$param = explode("=",$param); $param = explode("=",$param);
if($param[0] == 'selected_widget') $selected_widget = $param[1]; if($param[0] == 'selected_widget') $selected_widget = $param[1];
} }
$oWidgetModel = getModel('widget'); if($selected_widget) $widget_info = WidgetModel::getWidgetInfo($selected_widget);
if($selected_widget) $widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
Context::set('allow_multiple', $widget_info->extra_var->images->allow_multiple); Context::set('allow_multiple', $widget_info->extra_var->images->allow_multiple);
$output = self::getModuleFileBoxList(); $output = self::getModuleFileBoxList();

36
modules/page/page.admin.view.php
View file

@ -18,12 +18,10 @@ class PageAdminView extends Page
{ {
// Pre-check if module_srl exists. Set module_info if exists // Pre-check if module_srl exists. Set module_info if exists
$module_srl = Context::get('module_srl'); $module_srl = Context::get('module_srl');
// Create module model object
$oModuleModel = getModel('module');
// module_srl two come over to save the module, putting the information in advance // module_srl two come over to save the module, putting the information in advance
if($module_srl) if($module_srl)
{ {
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
if(!$module_info) if(!$module_info)
{ {
Context::set('module_srl',''); Context::set('module_srl','');
@ -37,7 +35,7 @@ class PageAdminView extends Page
} }
} }
// Get a list of module categories // Get a list of module categories
$module_category = $oModuleModel->getModuleCategories(); $module_category = ModuleModel::getModuleCategories();
Context::set('module_category', $module_category); Context::set('module_category', $module_category);
//Security //Security
$security = new Security(); $security = new Security();
@ -65,8 +63,7 @@ class PageAdminView extends Page
if(in_array($search_target,$search_target_list) && $search_keyword) $args->{$search_target} = $search_keyword; if(in_array($search_target,$search_target_list) && $search_keyword) $args->{$search_target} = $search_keyword;
$output = executeQuery('page.getPageList', $args); $output = executeQuery('page.getPageList', $args);
$oModuleModel = getModel('module'); $page_list = ModuleModel::addModuleExtraVars($output->data);
$page_list = $oModuleModel->addModuleExtraVars($output->data);
moduleModel::syncModuleToSite($page_list); moduleModel::syncModuleToSite($page_list);
$oModuleAdminModel = getAdminModel('module'); /* @var $oModuleAdminModel moduleAdminModel */ $oModuleAdminModel = getAdminModel('module'); /* @var $oModuleAdminModel moduleAdminModel */
@ -105,27 +102,24 @@ class PageAdminView extends Page
// If the layout is destined to add layout information haejum (layout_title, layout) // If the layout is destined to add layout information haejum (layout_title, layout)
if($module_info->layout_srl > 0) if($module_info->layout_srl > 0)
{ {
$oLayoutModel = getModel('layout'); $layout_info = LayoutModel::getLayout($module_info->layout_srl);
$layout_info = $oLayoutModel->getLayout($module_info->layout_srl);
$module_info->layout = $layout_info->layout; $module_info->layout = $layout_info->layout;
$module_info->layout_title = $layout_info->layout_title; $module_info->layout_title = $layout_info->layout_title;
} }
// Get a layout list // Get a layout list
$oLayoutModel = getModel('layout'); $layout_list = LayoutModel::getLayoutList();
$layout_list = $oLayoutModel->getLayoutList();
Context::set('layout_list', $layout_list); Context::set('layout_list', $layout_list);
$mobile_layout_list = $oLayoutModel->getLayoutList(0,"M"); $mobile_layout_list = LayoutModel::getLayoutList(0,"M");
Context::set('mlayout_list', $mobile_layout_list); Context::set('mlayout_list', $mobile_layout_list);
// Set a template file // Set a template file
if($this->module_info->page_type == 'ARTICLE') if($this->module_info->page_type == 'ARTICLE')
{ {
$oModuleModel = getModel('module'); $skin_list = ModuleModel::getSkins($this->module_path);
$skin_list = $oModuleModel->getSkins($this->module_path);
Context::set('skin_list',$skin_list); Context::set('skin_list',$skin_list);
$mskin_list = $oModuleModel->getSkins($this->module_path, "m.skins"); $mskin_list = ModuleModel::getSkins($this->module_path, "m.skins");
Context::set('mskin_list', $mskin_list); Context::set('mskin_list', $mskin_list);
} }
@ -179,8 +173,7 @@ class PageAdminView extends Page
{ {
if($method == '_getArticleContent' && $this->module_info->is_mskin_fix == 'N') if($method == '_getArticleContent' && $this->module_info->is_mskin_fix == 'N')
{ {
$oModuleModel = getModel('module'); $oPageMobile->module_info->mskin = ModuleModel::getModuleDefaultSkin('page', 'M');
$oPageMobile->module_info->mskin = $oModuleModel->getModuleDefaultSkin('page', 'M');
} }
$page_content = $oPageMobile->{$method}(); $page_content = $oPageMobile->{$method}();
} }
@ -246,13 +239,12 @@ class PageAdminView extends Page
Context::set('content', $content); Context::set('content', $content);
// Convert them to teach the widget // Convert them to teach the widget
$oWidgetController = getController('widget'); $oWidgetController = WidgetController::getInstance();
$content = $oWidgetController->transWidgetCode($content, true, !$isMobile); $content = $oWidgetController->transWidgetCode($content, true, !$isMobile);
// $content = str_replace('$', '$', $content); // $content = str_replace('$', '$', $content);
Context::set('page_content', $content); Context::set('page_content', $content);
// Set widget list // Set widget list
$oWidgetModel = getModel('widget'); $widget_list = WidgetModel::getDownloadedWidgetList();
$widget_list = $oWidgetModel->getDownloadedWidgetList();
Context::set('widget_list', $widget_list); Context::set('widget_list', $widget_list);
//Security //Security
@ -270,8 +262,7 @@ class PageAdminView extends Page
function _setArticleTypeContentModify($isMobile = false) function _setArticleTypeContentModify($isMobile = false)
{ {
$oDocumentModel = getModel('document'); $oDocument = DocumentModel::getDocument(0);
$oDocument = $oDocumentModel->getDocument(0);
if($isMobile) if($isMobile)
{ {
@ -326,9 +317,8 @@ class PageAdminView extends Page
$module_srl = Context::get('module_srl'); $module_srl = Context::get('module_srl');
if(!$module_srl) return $this->dispContent(); if(!$module_srl) return $this->dispContent();
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module', 'mid'); $columnList = array('module_srl', 'module', 'mid');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList); $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl, $columnList);
Context::set('module_info',$module_info); Context::set('module_info',$module_info);
// Set a template file // Set a template file
$this->setTemplateFile('page_delete'); $this->setTemplateFile('page_delete');