Merge branch 'rhymix:master' into master

modules/layout/layout.model.php

@@ -81,11 +81,7 @@ class LayoutModel extends Layout
 			}
 
 			$token = explode('|@|', $val->layout);
-			if(count($token) == 2)
+			if($layoutType == 'M')
-			{
-				$thumbnailPath = sprintf('./themes/%s/layouts/%s/thumbnail.png' , $token[0], $token[1]);
-			}
-			else 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/';
+			$path = RX_BASEDIR . 'layouts/' . $layout;
-			$themePathFormat = RX_BASEDIR . 'themes/%s/layouts/%s';
 		}
 		else
 		{
-			$pathPrefix = RX_BASEDIR . 'm.layouts/';
+			$path = RX_BASEDIR . 'm.layouts/' . $layout;
-			$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;
 		}
 
 		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($layout_name == 'faceoff')
-		if(count($layout_parse) > 1)
-		{
-			$class_path = './themes/'.$layout_parse[0].'/layouts/'.$layout_parse[1].'/';
-		}
-		else if($layout_name == 'faceoff')
 		{
 			$class_path = './modules/layout/faceoff/';
 		}

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';

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 = '로그인';

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;
 			}
 		}
 

modules/member/queries/getMemberList.xml

@@ -19,6 +19,7 @@
 			<condition operation="like" column="phone_number" var="s_phone_number" pipe="or" />
             <condition operation="like" column="birthday" var="s_birthday" pipe="or" />
             <condition operation="like" column="extra_vars" var="s_extra_vars" pipe="or" />
+			<condition operation="like" column="description" var="s_description" pipe="or" />
             <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
 			<condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
             <condition operation="like_prefix" column="last_login" var="s_last_login" pipe="or" />

modules/member/queries/getMemberListWithinGroup.xml

@@ -22,6 +22,7 @@
 			<condition operation="like" column="member.phone_number" var="s_phone_number" pipe="or" />
 			<condition operation="like" column="member.birthday" var="s_birthday" pipe="or" />
 			<condition operation="like" column="member.extra_vars" var="s_extra_vars" pipe="or" />
+			<condition operation="like" column="member.description" var="s_description" pipe="or" />
 			<condition operation="like_prefix" column="member.regdate" var="s_regdate" pipe="or" />
 			<condition operation="like_prefix" column="member.ipaddress" var="s_ipaddress" pipe="or" />
 			<condition operation="like_prefix" column="member.last_login" var="s_last_login" pipe="or" />

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
+		// Get current layout information
-		$theme_file = RX_BASEDIR.'files/theme/theme_info.php';
+		$default_mid = ModuleModel::getDefaultMid();
-		if(is_readable($theme_file))
+		Context::set('current_layout', $default_mid->layout_srl);
-		{
-			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 default group list
 		$oMemberModel = getModel('member');

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;