From 0f1b20eb5075839cf84907a0257a15bc73b08cc0 Mon Sep 17 00:00:00 2001
From: khongchi <sungbum00@gmail.com>
Date: Tue, 21 Jan 2014 17:40:18 +0900
Subject: [PATCH] =?UTF-8?q?#285=20action=5Fforward=EA=B0=80=20=EC=A0=9C?=
 =?UTF-8?q?=EB=8C=80=EB=A1=9C=20=EC=9E=91=EB=8F=99=ED=95=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0,?=
 =?UTF-8?q?=20#242=20action=5Fforward=20=EA=B4=80=EB=A0=A8=20=EC=BA=90?=
 =?UTF-8?q?=EC=8B=9C=20=EA=B8=B0=EB=8A=A5=20=EC=A0=95=EC=83=81=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/default/layout.html     |  2 +-
 modules/module/module.model.php | 31 ++++++++++++++++++-------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/layouts/default/layout.html b/layouts/default/layout.html
index 61410210e..0072594c4 100644
--- a/layouts/default/layout.html
+++ b/layouts/default/layout.html
@@ -20,7 +20,7 @@
 			<img widget="login_info" skin="default" />
 			<!-- /ACCOUNT -->
 			<!-- SEARCH -->
-			<form action="{getUrl()}" method="get" class="search">
+			<form action="{getUrl()}" method="post" class="search">
 				<input type="hidden" name="vid" value="{$vid}" />
 				<input type="hidden" name="mid" value="{$mid}" />
 				<input type="hidden" name="act" value="IS" />
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index d61094f5f..0804b41af 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -565,7 +565,7 @@ class moduleModel extends module
 	/**
 	 * @brief Get forward value by the value of act
 	 */
-	function getActionForward($act, $module = '')
+	function getActionForward($act)
 	{
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
@@ -575,28 +575,33 @@ class moduleModel extends module
 			$action_forward = $oCacheHandler->get($cache_key);
 		}
 
+		// retrieve and caching all registered action_forward
 		if(!$action_forward)
 		{
 			$args = new stdClass();
-			$args->act = $act;
-			$args->module = ($module) ? $module : null;
-			if(strlen($args->module) > 0)
+			$output = executeQueryArray('module.getActionForward',$args);
+
+			$action_forward = array();
+			foreach($output->data as $item)
 			{
-				$output = executeQuery('module.getActionForwardWithModule', $args);
+				$action_forward[$item->act] = $item;
 			}
-			else
-			{
-				$output = executeQuery('module.getActionForward',$args);
-			}
-			$action_forward = $output->data;
-			debugPrint($action_forward);
+
+			
 			if($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($cache_key, $action_forward);
 			}
 		}
-
-		return $action_forward;
+		
+		if($action_forward[$act])
+		{
+			return $action_forward[$act];
+		}
+		else
+		{
+			return new stdClass();  
+		}
 	}
 
 	/**