From 469bd22ba2220a9da299f08be6519bfeb6d98611 Mon Sep 17 00:00:00 2001
From: khongchi <sungbum00@gmail.com>
Date: Tue, 21 Jan 2014 15:05:38 +0900
Subject: [PATCH] =?UTF-8?q?#272=20domain=EC=9D=84=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=ED=95=9C=20=EA=B0=80=EC=83=81=EC=82=AC=EC=9D=B4=ED=8A=B8?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20return=5Furl=20=EC=B2=98=EB=A6=AC=EB=A5=BC?=
 =?UTF-8?q?=20=EC=A0=9C=EB=8C=80=EB=A1=9C=20=EC=88=98=ED=96=89=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/module/ModuleHandler.class.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 6203f278c..74b7d2868 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -105,6 +105,10 @@ class ModuleHandler extends Handler
 	 * */
 	function init()
 	{
+		
+		$oModuleModel = getModel('module');
+		$site_module_info = Context::get('site_module_info');
+
 		// if success_return_url and error_return_url is incorrect
 		$urls = array(Context::get('success_return_url'), Context::get('error_return_url'));
 		foreach($urls as $url)
@@ -113,23 +117,20 @@ class ModuleHandler extends Handler
 			{
 				continue;
 			}
-
+		
 			$urlInfo = parse_url($url);
 			$host = $urlInfo['host'];
-
+		
 			$dbInfo = Context::getDBInfo();
 			$defaultUrlInfo = parse_url($dbInfo->default_url);
 			$defaultHost = $defaultUrlInfo['host'];
-
-			if($host && $host != $defaultHost)
+		
+			if($host && ($host != $defaultHost && $host != $site_module_info->domain))
 			{
 				throw new Exception('msg_default_url_is_null');
 			}
 		}
 		
-		$oModuleModel = getModel('module');
-		$site_module_info = Context::get('site_module_info');
-
 		if(!$this->document_srl && $this->mid && $this->entry)
 		{
 			$oDocumentModel = getModel('document');
@@ -154,11 +155,9 @@ class ModuleHandler extends Handler
 			{
 				// If it exists, compare mid based on the module information
 				// if mids are not matching, set it as the document's mid
-				if(($this->mid && $this->mid != $module_info->mid) || ($this->module_srl && $this->module_srl != $module_info->module_srl))
+				if(!$this->mid || ($this->mid && $this->mid != $module_info->mid) || ($this->module_srl && $this->module_srl != $module_info->module_srl))
 				{
 					$this->mid = $module_info->mid;
-					$this->module_srl = $module_info->module_srl;
-					Context::set('mid', $module_info->mid, TRUE);
 					header('location:' . getNotEncodedSiteUrl($site_info->domain, 'mid', $this->mid, 'document_srl', $this->document_srl, 'module_srl',''));
 					return FALSE;
 				}
@@ -276,7 +275,7 @@ class ModuleHandler extends Handler
 		{
 			Context::set('mid', $this->mid, TRUE);
 		}
-
+		
 		// Call a trigger after moduleHandler init
 		$output = ModuleHandler::triggerCall('moduleHandler.init', 'after', $this->module_info);
 		if(!$output->toBool())