From 18401d2688b3b7db1433c4a745c4093b6026e48d Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sat, 21 Feb 2026 21:41:35 +0900 Subject: [PATCH 1/4] Remove reference to old theme file #2677 --- modules/menu/menu.admin.view.php | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/modules/menu/menu.admin.view.php b/modules/menu/menu.admin.view.php index 0587d1411..12a555f17 100644 --- a/modules/menu/menu.admin.view.php +++ b/modules/menu/menu.admin.view.php @@ -51,23 +51,14 @@ class MenuAdminView extends Menu $resultModuleList = $oMenuAdminModel->getModuleListInSitemap($site_srl); Context::set('module_list', $resultModuleList); + // Get installed layout list $oLayoutModel = getModel('layout'); $layoutList = $oLayoutModel->getLayoutList(); Context::set('layout_list', $layoutList); - // choice theme file - $theme_file = RX_BASEDIR.'files/theme/theme_info.php'; - if(is_readable($theme_file)) - { - include($theme_file); - Context::set('current_layout', $theme_info->layout); - } - else - { - $oModuleModel = getModel('module'); - $default_mid = $oModuleModel->getDefaultMid(); - Context::set('current_layout', $default_mid->layout_srl); - } + // Get current layout information + $default_mid = ModuleModel::getDefaultMid(); + Context::set('current_layout', $default_mid->layout_srl); // get default group list $oMemberModel = getModel('member'); From d47dd2d82492d8d701a155e7f1220756f99f35e1 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sat, 21 Feb 2026 21:45:39 +0900 Subject: [PATCH 2/4] Remove reference to old themes in layout module --- modules/layout/layout.model.php | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php index b12e80112..b161ff6f8 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -81,11 +81,7 @@ class LayoutModel extends Layout } $token = explode('|@|', $val->layout); - if(count($token) == 2) - { - $thumbnailPath = sprintf('./themes/%s/layouts/%s/thumbnail.png' , $token[0], $token[1]); - } - else if($layoutType == 'M') + if($layoutType == 'M') { $thumbnailPath = sprintf('./m.layouts/%s/thumbnail.png' , $val->layout); } @@ -227,26 +223,13 @@ class LayoutModel extends Layout */ public static function isExistsLayoutFile($layout, $layoutType) { - //TODO If remove a support themes, remove this codes also. if($layoutType == 'P') { - $pathPrefix = RX_BASEDIR . 'layouts/'; - $themePathFormat = RX_BASEDIR . 'themes/%s/layouts/%s'; + $path = RX_BASEDIR . 'layouts/' . $layout; } else { - $pathPrefix = RX_BASEDIR . 'm.layouts/'; - $themePathFormat = RX_BASEDIR . 'themes/%s/m.layouts/%s'; - } - - if(strpos($layout, '|@|') !== FALSE) - { - list($themeName, $layoutName) = explode('|@|', $layout); - $path = sprintf($themePathFormat, $themeName, $layoutName); - } - else - { - $path = $pathPrefix . $layout; + $path = RX_BASEDIR . 'm.layouts/' . $layout; } if (file_exists($path . '/layout.html') && is_readable($path . '/layout.html')) @@ -333,12 +316,7 @@ class LayoutModel extends Layout */ public function getLayoutPath($layout_name = "", $layout_type = "P") { - $layout_parse = explode('|@|', $layout_name ?? ''); - if(count($layout_parse) > 1) - { - $class_path = './themes/'.$layout_parse[0].'/layouts/'.$layout_parse[1].'/'; - } - else if($layout_name == 'faceoff') + if($layout_name == 'faceoff') { $class_path = './modules/layout/faceoff/'; } From a53e293a5a112047dc069ef8290668bfa86d23cb Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sat, 21 Feb 2026 21:51:41 +0900 Subject: [PATCH 3/4] Support searching admin memo in member list #2676 --- modules/member/lang/en.php | 1 + modules/member/lang/ko.php | 1 + modules/member/member.admin.model.php | 3 +++ modules/member/queries/getMemberList.xml | 1 + modules/member/queries/getMemberListWithinGroup.xml | 1 + 5 files changed, 7 insertions(+) diff --git a/modules/member/lang/en.php b/modules/member/lang/en.php index 5f701c334..24eceb38c 100644 --- a/modules/member/lang/en.php +++ b/modules/member/lang/en.php @@ -114,6 +114,7 @@ $lang->search_target_list['last_login_less'] = 'Last Login Date (less)'; $lang->search_target_list['last_login_ipaddress'] = 'Last Login IP address'; $lang->search_target_list['birthday'] = 'Birthday'; $lang->search_target_list['extra_vars'] = 'User Defined'; +$lang->search_target_list['description'] = 'Admin Memo'; $lang->cmd_modify_new_auth_email_address = 'New email address'; $lang->cmd_set_design_info = 'Desgin'; $lang->cmd_login = 'Login'; diff --git a/modules/member/lang/ko.php b/modules/member/lang/ko.php index ca5014207..dee729b3b 100644 --- a/modules/member/lang/ko.php +++ b/modules/member/lang/ko.php @@ -116,6 +116,7 @@ $lang->search_target_list['last_login_less'] = '최근 로그인 일시(이하)' $lang->search_target_list['last_login_ipaddress'] = '최근 로그인 IP 주소'; $lang->search_target_list['birthday'] = '생일'; $lang->search_target_list['extra_vars'] = '사용자 정의'; +$lang->search_target_list['description'] = '관리자 메모'; $lang->cmd_modify_new_auth_email_address = '신규 메일 주소로 변경 후 인증 메일 발송'; $lang->cmd_set_design_info = '디자인'; $lang->cmd_login = '로그인'; diff --git a/modules/member/member.admin.model.php b/modules/member/member.admin.model.php index 18f434a03..3f4a6f192 100644 --- a/modules/member/member.admin.model.php +++ b/modules/member/member.admin.model.php @@ -121,6 +121,9 @@ class MemberAdminModel extends Member case 'extra_vars' : $args->s_extra_vars = $search_keyword; break; + case 'description' : + $args->s_description = $search_keyword; + break; } } diff --git a/modules/member/queries/getMemberList.xml b/modules/member/queries/getMemberList.xml index f781b2b69..68fa93b75 100644 --- a/modules/member/queries/getMemberList.xml +++ b/modules/member/queries/getMemberList.xml @@ -19,6 +19,7 @@ + diff --git a/modules/member/queries/getMemberListWithinGroup.xml b/modules/member/queries/getMemberListWithinGroup.xml index 292ff0d7a..448f8b17a 100644 --- a/modules/member/queries/getMemberListWithinGroup.xml +++ b/modules/member/queries/getMemberListWithinGroup.xml @@ -22,6 +22,7 @@ + From 37b23341be394fd421e6d51a905260f00693e3b4 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sun, 22 Feb 2026 20:18:05 +0900 Subject: [PATCH 4/4] Fix template path error in mobile document page #2679 --- modules/page/page.mobile.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/page/page.mobile.php b/modules/page/page.mobile.php index 967b13013..fb1c44b4d 100644 --- a/modules/page/page.mobile.php +++ b/modules/page/page.mobile.php @@ -19,16 +19,17 @@ class PageMobile extends PageView Context::set('document_srl', $document_srl); } Context::set('oDocument', $oDocument); + Context::set('page_content', $oDocument->getContent(false, false)); $oTemplate = Rhymix\Framework\Template::getInstance(); - $template_path = $this->getTemplatePath(); + $template_path = $this->getTemplatePath() ?: ($this->module_path . 'tpl'); if (preg_match('!/skins/!', $template_path)) { - $page_content = $oTemplate->compile($this->getTemplatePath(), 'content'); + $page_content = $oTemplate->compile($template_path, 'content'); } else { - $page_content = $oTemplate->compile($this->getTemplatePath(), 'mobile'); + $page_content = $oTemplate->compile($template_path, 'mobile'); } return $page_content;