From f0ad692650ece57840c1cdf72a51f753850d3ede Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 5 Dec 2017 23:57:58 +0900
Subject: [PATCH] Enable responsive skin in member, communication, and
 ncenterlite
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

회원, 커뮤니케이션, 알림센터Lite 모듈에서 모바일 스킨을 선택할 때
PC와 동일한 반응형 스킨을 지정할 수 있도록 개선
---
 .../communication/communication.mobile.php    | 23 ++++++++++++++---
 modules/member/member.mobile.php              | 14 ++++++++---
 modules/member/tpl/design_config.html         |  4 +--
 modules/module/module.model.php               | 25 +++++++------------
 modules/ncenterlite/ncenterlite.mobile.php    | 20 ++++++++++++---
 modules/ncenterlite/tpl/skinsetting.html      |  4 +--
 6 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/modules/communication/communication.mobile.php b/modules/communication/communication.mobile.php
index cf084b358..2d2f96b05 100644
--- a/modules/communication/communication.mobile.php
+++ b/modules/communication/communication.mobile.php
@@ -14,12 +14,25 @@ class communicationMobile extends communicationView
 		$oCommunicationModel = getModel('communication');
 
 		$this->config = $oCommunicationModel->getConfig();
-		$skin = $this->config->mskin;
-
 		Context::set('communication_config', $this->config);
 
-		$tpl_path = sprintf('%sm.skins/%s', $this->module_path, $skin);
-		$this->setTemplatePath($tpl_path);
+		$mskin = $this->config->mskin;
+		if(!$mskin)
+		{
+			$template_path = sprintf('%sm.skins/%s/', $this->module_path, 'default');
+		}
+		elseif($mskin === '/USE_RESPONSIVE/')
+		{
+			$template_path = sprintf("%sskins/%s/", $this->module_path, $this->config->skin);
+			if(!is_dir($template_path) || !$this->config->skin)
+			{
+				$template_path = sprintf("%sskins/%s/", $this->module_path, 'default');
+			}
+		}
+		else
+		{
+			$template_path = sprintf('%sm.skins/%s', $this->module_path, $mskin);
+		}
 
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($this->config->mlayout_srl);
@@ -28,6 +41,8 @@ class communicationMobile extends communicationView
 			$this->module_info->mlayout_srl = $this->config->mlayout_srl;
 			$this->setLayoutPath($layout_info->path);
 		}
+		
+		$this->setTemplatePath($template_path);
 	}
 
 	/**
diff --git a/modules/member/member.mobile.php b/modules/member/member.mobile.php
index 92867099f..345e7f1da 100644
--- a/modules/member/member.mobile.php
+++ b/modules/member/member.mobile.php
@@ -18,13 +18,19 @@ class memberMobile extends memberView
 		$oSecurity = new Security();
 		$oSecurity->encodeHTML('member_config.signupForm..');
 
-
-		$mskin = $this->member_config->mskin;
 		// Set the template path
+		$mskin = $this->member_config->mskin;
 		if(!$mskin)
 		{
-			$mskin = 'default';
-			$template_path = sprintf('%sm.skins/%s', $this->module_path, $mskin);
+			$template_path = sprintf('%sm.skins/%s/', $this->module_path, 'default');
+		}
+		elseif($mskin === '/USE_RESPONSIVE/')
+		{
+			$template_path = sprintf("%sskins/%s/", $this->module_path, $this->member_config->skin);
+			if(!is_dir($template_path) || !$this->member_config->skin)
+			{
+				$template_path = sprintf("%sskins/%s/", $this->module_path, 'default');
+			}
 		}
 		else
 		{
diff --git a/modules/member/tpl/design_config.html b/modules/member/tpl/design_config.html
index e83d65ac5..7fcdc91e7 100644
--- a/modules/member/tpl/design_config.html
+++ b/modules/member/tpl/design_config.html
@@ -31,7 +31,7 @@
 		<div class="x_controls">
 			<select id="mlayout" name="mlayout_srl">
 				<option value="0">{$lang->notuse}</option>
-				<option loop="$mlayout_list => $key,$val" value="{$val->layout_srl}" selected="selected"|cond="$val->layout_srl == $config->mlayout_srl">{$val->title} ({$val->layout})</option>
+				<option loop="$mlayout_list => $key,$val" value="{$val->layout_srl}" selected="selected"|cond="$val->layout_srl == $config->mlayout_srl">{$val->title} <block cond="$val->layout">({$val->layout})</block></option>
 			</select>
 		</div>
 	</div>
@@ -39,7 +39,7 @@
 		<label class="x_control-label" for="mskin">{$lang->mobile_skin}</label>
 		<div class="x_controls">
 			<select id="mskin" name="mskin">
-				<option loop="$mskin_list=>$key,$val" value="{$key}" selected="selected"|cond="$config->mskin==$key">{$val->title} ({$key})</option>
+				<option loop="$mskin_list=>$key,$val" value="{$key}" selected="selected"|cond="$config->mskin==$key">{$val->title} <block cond="!starts_with('/', $key)">({$key})</block></option>
 			</select>
 		</div>
 	</div>
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index 849b89ba2..aaee58412 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -1110,18 +1110,11 @@ class moduleModel extends module
 		{
 			$moduleName = 'ARTICLE';
 		}
+		
+		$useDefaultList = array();
 		if(array_key_exists($moduleName, $installedMenuTypes))
 		{
-			if($dir == 'skins')
-			{
-				$type = 'P';
-			}
-			else
-			{
-				$type = 'M';
-			}
-			$defaultSkinName = $this->getModuleDefaultSkin($module, $type);
-
+			$defaultSkinName = $this->getModuleDefaultSkin($module, $dir == 'skins' ? 'P' : 'M');
 			if(isset($defaultSkinName))
 			{
 				$defaultSkinInfo = $this->loadSkinInfo($path, $defaultSkinName, $dir);
@@ -1130,14 +1123,14 @@ class moduleModel extends module
 				$useDefault->title = lang('use_site_default_skin') . ' (' . $defaultSkinInfo->title . ')';
 
 				$useDefaultList['/USE_DEFAULT/'] = $useDefault;
-				if($type === 'M')
-				{
-					$useDefaultList['/USE_RESPONSIVE/'] = (object)array('title' => lang('use_responsive_pc_skin'));
-				}
-
-				$skin_list = array_merge($useDefaultList, $skin_list);
 			}
 		}
+		if($dir == 'm.skins')
+		{
+			$useDefaultList['/USE_RESPONSIVE/'] = (object)array('title' => lang('use_responsive_pc_skin'));
+		}
+
+		$skin_list = array_merge($useDefaultList, $skin_list);
 
 		return $skin_list;
 	}
diff --git a/modules/ncenterlite/ncenterlite.mobile.php b/modules/ncenterlite/ncenterlite.mobile.php
index 3b71a927a..6d0ac9c21 100644
--- a/modules/ncenterlite/ncenterlite.mobile.php
+++ b/modules/ncenterlite/ncenterlite.mobile.php
@@ -6,11 +6,23 @@ class ncenterliteMobile extends ncenterliteView
 	{
 		$oNcenterliteModel = getModel('ncenterlite');
 		$config = $oNcenterliteModel->getConfig();
-		$template_path = sprintf("%sm.skins/%s/",$this->module_path, $config->mskin);
-		if(!is_dir($template_path)||!$config->mskin)
+
+		$mskin = $config->mskin;
+		if(!$mskin)
 		{
-			$config->skin = 'default';
-			$template_path = sprintf("%sm.skins/%s/",$this->module_path, $config->mskin);
+			$template_path = sprintf('%sm.skins/%s/', $this->module_path, 'default');
+		}
+		elseif($mskin === '/USE_RESPONSIVE/')
+		{
+			$template_path = sprintf("%sskins/%s/", $this->module_path, $config->skin);
+			if(!is_dir($template_path) || !$config->skin)
+			{
+				$template_path = sprintf("%sskins/%s/", $this->module_path, 'default');
+			}
+		}
+		else
+		{
+			$template_path = sprintf('%sm.skins/%s', $this->module_path, $mskin);
 		}
 		$this->setTemplatePath($template_path);
 
diff --git a/modules/ncenterlite/tpl/skinsetting.html b/modules/ncenterlite/tpl/skinsetting.html
index 163ff7196..939585910 100644
--- a/modules/ncenterlite/tpl/skinsetting.html
+++ b/modules/ncenterlite/tpl/skinsetting.html
@@ -40,7 +40,7 @@
 			<div class="x_controls">
 				<select name="skin" id="skin" onchange="doDisplaySkinColorset(this); return false;">
 					<option loop="$skin_list => $key, $val" value="{$key}" selected="selected"|cond="$config->skin == $key">
-						{$val->title} ({htmlspecialchars($key)})
+						{$val->title} ({escape($key)})
 					</option>
 				</select>
 			</div>
@@ -60,7 +60,7 @@
 			<div class="x_controls">
 				<select name="mskin" id="mskin" onchange="doDisplayMobileSkinColorset(this); return false;">
 					<option loop="$mskin_list => $key, $val" value="{$key}" selected="selected"|cond="$config->mskin == $key">
-						{$val->title} ({htmlspecialchars($key)})
+						{$val->title} <block cond="!starts_with('/', $key)">({escape($key)})</block>
 					</option>
 				</select>
 			</div>