From 34fca81212ff2b530a59b0f8dcb234de59424403 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Sat, 8 Feb 2014 13:58:52 +0900
Subject: [PATCH 01/44] =?UTF-8?q?fix=20#445=20APC=EC=97=90=EC=84=9C=20dele?=
 =?UTF-8?q?te()=EA=B0=80=20null=EC=9D=84=20=EC=82=BD=EC=9E=85=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/cache/CacheApc.class.php | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/classes/cache/CacheApc.class.php b/classes/cache/CacheApc.class.php
index a416b1270..73abeb0b3 100644
--- a/classes/cache/CacheApc.class.php
+++ b/classes/cache/CacheApc.class.php
@@ -84,7 +84,7 @@ class CacheApc extends CacheBase
 
 		if($modified_time > 0 && $modified_time > $obj[0])
 		{
-			$this->_delete($_key);
+			$this->delete($_key);
 			return false;
 		}
 
@@ -110,24 +110,13 @@ class CacheApc extends CacheBase
 
 		if($modified_time > 0 && $modified_time > $obj[0])
 		{
-			$this->_delete($_key);
+			$this->delete($_key);
 			return false;
 		}
 
 		return $obj[1];
 	}
 
-	/**
-	 * Delete variable from the cache(private)
-	 *
-	 * @param string $_key Used to store the value.
-	 * @return void
-	 */
-	function _delete($_key)
-	{
-		$this->put($_key, null, 1);
-	}
-
 	/**
 	 * Delete variable from the cache
 	 *
@@ -136,7 +125,7 @@ class CacheApc extends CacheBase
 	 */
 	function delete($key)
 	{
-		$this->_delete($key);
+		return apc_delete($key);
 	}
 
 	/**
@@ -149,7 +138,13 @@ class CacheApc extends CacheBase
 		return apc_clear_cache('user');
 	}
 
-
+	/**
+	 * @DEPRECATED
+	 */
+	function _delete($key)
+	{
+		return $this->delete($key);
+	}
 }
 
 CacheApc::$isSupport  = function_exists('apc_add');

From d2d59fc36771488e846fe0b6071b50a5ecad99fb Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Mon, 10 Mar 2014 09:43:02 +0900
Subject: [PATCH 02/44] =?UTF-8?q?fix=20#489=20APC=20cache=EA=B0=80=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/cache/CacheApc.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/classes/cache/CacheApc.class.php b/classes/cache/CacheApc.class.php
index 73abeb0b3..b8499d7a6 100644
--- a/classes/cache/CacheApc.class.php
+++ b/classes/cache/CacheApc.class.php
@@ -84,7 +84,7 @@ class CacheApc extends CacheBase
 
 		if($modified_time > 0 && $modified_time > $obj[0])
 		{
-			$this->delete($_key);
+			$this->delete($key);
 			return false;
 		}
 
@@ -110,7 +110,7 @@ class CacheApc extends CacheBase
 
 		if($modified_time > 0 && $modified_time > $obj[0])
 		{
-			$this->delete($_key);
+			$this->delete($key);
 			return false;
 		}
 
@@ -125,7 +125,8 @@ class CacheApc extends CacheBase
 	 */
 	function delete($key)
 	{
-		return apc_delete($key);
+		$_key = md5(_XE_PATH_ . $key);
+		return apc_delete($_key);
 	}
 
 	/**

From d01d85946ab53914bd6fec8604426915485b4270 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Thu, 27 Feb 2014 10:13:09 +0900
Subject: [PATCH 03/44] =?UTF-8?q?fix=20#480=20class=5Fexists()=EC=9D=98=20?=
 =?UTF-8?q?autoload=20=EB=B9=84=ED=99=9C=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/captcha/captcha.addon.php               | 2 +-
 addons/captcha_member/captcha_member.addon.php | 2 +-
 classes/module/ModuleHandler.class.php         | 4 ++--
 classes/validator/Validator.class.php          | 4 ++--
 modules/widget/widget.controller.php           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/captcha/captcha.addon.php b/addons/captcha/captcha.addon.php
index 433adf527..a03a9d847 100644
--- a/addons/captcha/captcha.addon.php
+++ b/addons/captcha/captcha.addon.php
@@ -9,7 +9,7 @@ if(!defined("__XE__")) exit();
  * @brief Captcha for a particular action
  * English alphabets and voice verification added
  * */
-if(!class_exists('AddonCaptcha'))
+if(!class_exists('AddonCaptcha', false))
 {
 	// On the mobile mode, XE Core does not load jquery and xe.js as normal.
 	Context::loadFile(array('./common/js/jquery.min.js', 'head', NULL, -100000), true);
diff --git a/addons/captcha_member/captcha_member.addon.php b/addons/captcha_member/captcha_member.addon.php
index ac1e57c5f..211fd8687 100644
--- a/addons/captcha_member/captcha_member.addon.php
+++ b/addons/captcha_member/captcha_member.addon.php
@@ -9,7 +9,7 @@ if(!defined("__XE__")) exit();
  * @brief Captcha for a particular action
  * English alphabets and voice verification added
  * */
-if(!class_exists('AddonMemberCaptcha'))
+if(!class_exists('AddonMemberCaptcha', false))
 {
 	// On the mobile mode, XE Core does not load jquery and xe.js as normal.
 	Context::loadFile(array('./common/js/jquery.min.js', 'head', NULL, -100000), true);
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 802a75126..3b20145e3 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -1021,7 +1021,7 @@ class ModuleHandler extends Handler
 			}
 
 			// Get base class name and load the file contains it
-			if(!class_exists($module))
+			if(!class_exists($module, false))
 			{
 				$high_class_file = sprintf('%s%s%s.class.php', _XE_PATH_, $class_path, $module);
 				if(!file_exists($high_class_file))
@@ -1039,7 +1039,7 @@ class ModuleHandler extends Handler
 
 			// Create an instance with eval function
 			require_once($class_file);
-			if(!class_exists($instance_name))
+			if(!class_exists($instance_name, false))
 			{
 				return NULL;
 			}
diff --git a/classes/validator/Validator.class.php b/classes/validator/Validator.class.php
index 11762da50..8ad9d4f13 100644
--- a/classes/validator/Validator.class.php
+++ b/classes/validator/Validator.class.php
@@ -667,7 +667,7 @@ class Validator
 		}
 
 		// current language
-		$lang_type = class_exists('Context') ? Context::getLangType() : 'en';
+		$lang_type = class_exists('Context', false) ? Context::getLangType() : 'en';
 
 		// check the file
 		$filepath = $dir . '/' . md5($this->_version . ' ' . $this->_xml_path) . ".{$lang_type}.js";
@@ -706,7 +706,7 @@ class Validator
 		list($ruleset) = explode('.', $ruleset);
 
 		// current language
-		$lang_type = class_exists('Context') ? Context::getLangType() : 'en';
+		$lang_type = class_exists('Context', false) ? Context::getLangType() : 'en';
 
 		// custom rulesets
 		$addrules = array();
diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index 2fd0fdeeb..f807593cc 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -641,7 +641,7 @@ class widgetController extends widget
 			require_once($class_file);
 
 			// Creating Objects
-			if(!class_exists($widget))
+			if(!class_exists($widget, false))
 			{
 				return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
 			}

From 7aa70223f1061cdf1704e82168d7a22a278ecdc5 Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Wed, 19 Feb 2014 13:55:01 +0900
Subject: [PATCH 04/44] #498 document table's cache delete

---
 modules/document/document.controller.php | 56 ++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 338f082d4..f02019eb2 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -840,6 +840,14 @@ class documentController extends document
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.updateReadedCount', $args);
 
+		$oCacheHandler = CacheHandler::getInstance('object');
+		if($oCacheHandler->isSupport())
+		{
+			//remove document item from cache
+			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$oCacheHandler->delete($cache_key);
+		}
+
 		// Register session
 		$_SESSION['readed_document'][$document_srl] = true;
 
@@ -1105,6 +1113,14 @@ class documentController extends document
 
 		$oDB->commit();
 
+		$oCacheHandler = CacheHandler::getInstance('object');
+		if($oCacheHandler->isSupport())
+		{
+			//remove document item from cache
+			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$oCacheHandler->delete($cache_key);
+		}
+
 		// Leave in the session information
 		$_SESSION['voted_document'][$document_srl] = true;
 
@@ -1246,6 +1262,14 @@ class documentController extends document
 		{
 			$args->update_order = -1*getNextSequence();
 			$args->last_updater = $last_updater;
+
+			$oCacheHandler = CacheHandler::getInstance('object');
+			if($oCacheHandler->isSupport())
+			{
+				//remove document item from cache
+				$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+				$oCacheHandler->delete($cache_key);
+			}
 		}
 
 		return executeQuery('document.updateCommentCount', $args);
@@ -1263,6 +1287,14 @@ class documentController extends document
 		$args->document_srl = $document_srl;
 		$args->trackback_count = $trackback_count;
 
+		$oCacheHandler = CacheHandler::getInstance('object');
+		if($oCacheHandler->isSupport())
+		{
+			//remove document item from cache
+			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$oCacheHandler->delete($cache_key);
+		}
+
 		return executeQuery('document.updateTrackbackCount', $args);
 	}
 
@@ -1366,6 +1398,30 @@ class documentController extends document
 		if(!$output->toBool()) return $output;
 
 		$this->makeCategoryFile($category_info->module_srl);
+		// remvove cache
+		$oCacheHandler = CacheHandler::getInstance('object');
+		if($oCacheHandler->isSupport())
+		{
+			$page = 0;
+			while(true) {
+				$args = new stdClass();
+				$args->category_srl = $category_srl;
+				$args->page = ++$page;
+				$output = executeQuery('document.getDocumentList', $args, array('document_srl'));
+
+				if($output->data == array())
+					break;
+
+				foreach($output->data as $val)
+				{
+					$document_srl = $val->document_srl;
+					//remove document item from cache
+					$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+					$oCacheHandler->delete($cache_key);
+				}
+			}
+		}
+
 		// Update category_srl of the documents in the same category to 0
 		$args = new stdClass();
 		$args->target_category_srl = 0;

From d25cba6673d733bfaccfce359661c0329f3b1666 Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Wed, 19 Feb 2014 14:13:00 +0900
Subject: [PATCH 05/44] #498 document table's cache delete.. mod some code

---
 modules/document/document.controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index f02019eb2..5d56ca2c2 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -1406,6 +1406,7 @@ class documentController extends document
 			while(true) {
 				$args = new stdClass();
 				$args->category_srl = $category_srl;
+				$args->list_count = 100;
 				$args->page = ++$page;
 				$output = executeQuery('document.getDocumentList', $args, array('document_srl'));
 
@@ -1414,9 +1415,8 @@ class documentController extends document
 
 				foreach($output->data as $val)
 				{
-					$document_srl = $val->document_srl;
 					//remove document item from cache
-					$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+					$cache_key = 'document_item:'. getNumberingPath($val->document_srl) . $val->document_srl;
 					$oCacheHandler->delete($cache_key);
 				}
 			}

From 46396284c48ce414f3735f5619a90845fbd49f7e Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Fri, 28 Feb 2014 23:42:42 +0900
Subject: [PATCH 06/44] =?UTF-8?q?fix=20#540=20=ED=9C=B4=EC=A7=80=ED=86=B5?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99=ED=95=9C=20=EA=B8=80?=
 =?UTF-8?q?=EC=9D=98=20cache=EB=A5=BC=20=EC=82=AD=EC=A0=9C=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B0=94=EB=A1=9C=20=EC=9E=A1=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/document/document.controller.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 5d56ca2c2..3c8f0e9dd 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -801,6 +801,8 @@ class documentController extends document
 		$oCacheHandler = CacheHandler::getInstance('object');
 		if($oCacheHandler->isSupport())
 		{
+			$cache_key = 'document_item:'. getNumberingPath($oDocument->document_srl) . $oDocument->document_srl;
+			$oCacheHandler->delete($cache_key);
 		}
 
 		return $output;

From 0890387908ea48b6cfbaa0379e5918a889b3d79e Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Tue, 18 Feb 2014 18:18:23 +0900
Subject: [PATCH 07/44] =?UTF-8?q?#494=20=EB=B9=84=EB=B0=80=EB=B2=88?=
 =?UTF-8?q?=ED=98=B8=20=EC=B0=BE=EA=B8=B0=20=EC=A7=88=EB=AC=B8=ED=95=AD?=
 =?UTF-8?q?=EB=AA=A9=20=EB=AC=B8=EC=A0=9C=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/member/skins/default/find_member_account.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/member/skins/default/find_member_account.html b/modules/member/skins/default/find_member_account.html
index 70c166b9b..b80312c3b 100644
--- a/modules/member/skins/default/find_member_account.html
+++ b/modules/member/skins/default/find_member_account.html
@@ -41,7 +41,7 @@
 		</div>
 		<div>
 			<select name="find_account_question">
-			<!--@for($i=1,$c=count($lang->find_account_question_items);$i<$c;$i++)-->
+			<!--@for($i=1,$c=count($lang->find_account_question_items);$i<=$c;$i++)-->
 				<option value="{$i}">{$lang->find_account_question_items[$i]}</option>
 			<!--@end-->
 			</select>

From c558dbc713deb4c5eaaced6fc3efe8025ac1005a Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Sun, 9 Feb 2014 15:25:17 +0900
Subject: [PATCH 08/44] =?UTF-8?q?warning=20=EB=A9=94=EC=8B=9C=EC=A7=80?=
 =?UTF-8?q?=EB=A5=BC=20=ED=91=9C=EC=8B=9C=ED=95=98=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/config.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.inc.php b/config/config.inc.php
index 6304f6245..72080042e 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -9,11 +9,11 @@
  */
 if(version_compare(PHP_VERSION, '5.4.0', '<'))
 {
-	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
+	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING);
 }
 else
 {
-	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_STRICT);
+	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_STRICT);
 }
 
 if(!defined('__XE__'))

From 809a52679759082082a74a207fe351a2ff6330bb Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Sat, 8 Feb 2014 12:31:03 +0900
Subject: [PATCH 09/44] =?UTF-8?q?fix=20#416=20PHP=205.3.6=20=EC=9D=B4?=
 =?UTF-8?q?=EC=83=81=EC=97=90=EC=84=9C=EB=A7=8C=20=EC=82=AC=EC=9A=A9=20?=
 =?UTF-8?q?=EA=B0=80=EB=8A=A5=ED=95=9C=20=EC=83=81=EC=88=98=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/db/DB.class.php | 2 +-
 config/func.inc.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php
index f23320576..25a7cdb10 100644
--- a/classes/db/DB.class.php
+++ b/classes/db/DB.class.php
@@ -447,7 +447,7 @@ class DB
 		$log['act'] = Context::get('act');
 		$log['time'] = date('Y-m-d H:i:s');
 
-		$bt = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+		$bt = debug_backtrace();
 		foreach($bt as $no => $call)
 		{
 			if($call['function'] == 'executeQuery' || $call['function'] == 'executeQueryArray')
diff --git a/config/func.inc.php b/config/func.inc.php
index a3fe25156..a2c4c4d07 100644
--- a/config/func.inc.php
+++ b/config/func.inc.php
@@ -758,7 +758,7 @@ function debugPrint($debug_output = NULL, $display_option = TRUE, $file = '_debu
 	}
 
 	static $firephp;
-	$bt = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+	$bt = debug_backtrace();
 	if(is_array($bt))
 	{
 		$bt_debug_print = array_shift($bt);

From 996e03bc284020ca8747c1c54429c46336480af0 Mon Sep 17 00:00:00 2001
From: "Jin Hu, Baek" <m@ake.kr>
Date: Tue, 8 Apr 2014 03:18:38 +0900
Subject: [PATCH 10/44] remove spaces in checkbox, radio, select types inputbox

remove spaces in checkbox, radio, select types inputbox. and code optimizing
---
 classes/extravar/Extravar.class.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index e56cc1517..df235ca97 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -249,7 +249,7 @@ class ExtraItem
 
 				for($i = 0, $c = count($values); $i < $c; $i++)
 				{
-					$values[$i] = htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 				}
 
 				return $values;
@@ -306,21 +306,15 @@ class ExtraItem
 			case 'textarea' :
 				return nl2br($value);
 				
-			case 'checkbox' :
-				if(is_array($value))
-				{
-					return implode(', ', $value);
-				}
-				return $value;
-				
 			case 'date' :
 				return zdate($value, "Y-m-d");
 
+			case 'checkbox' :
 			case 'select' :
 			case 'radio' :
 				if(is_array($value))
 				{
-					return implode(', ', $value);
+					return implode(',', $value);
 				}
 				return $value;
 

From 239b07232dce0b6d43c5bb39a74d36d3695c7b15 Mon Sep 17 00:00:00 2001
From: "Jin Hu, Baek" <m@ake.kr>
Date: Tue, 8 Apr 2014 03:34:56 +0900
Subject: [PATCH 11/44] =?UTF-8?q?date=EB=B0=A9=EC=8B=9D=EC=9D=98=20?=
 =?UTF-8?q?=EC=9E=85=EB=A0=A5=ED=8F=BC=20=EC=95=88=EC=9D=98=20button?=
 =?UTF-8?q?=EC=9D=98=20class=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

XE 공용 버튼 스타일링 추가
---
 classes/extravar/Extravar.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index df235ca97..bfa3da383 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -424,7 +424,8 @@ class ExtraItem
 				Context::loadJavascriptPlugin('ui.datepicker');
 
 				$buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />'; 
-				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" /> <input type="button" value="' . Context::getLang('cmd_delete') . '" id="dateRemover_' . $column_name . '" />';
+				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />'
+				$buff[] =	'<input type="button" value="' . Context::getLang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
 				$buff[] =	'<script type="text/javascript">';
 				$buff[] = '//<![CDATA[';
 				$buff[] =	'(function($){';

From 75ddf5acd2a71f14cb97c18643f1801127dfb851 Mon Sep 17 00:00:00 2001
From: "Jin Hu, Baek" <m@ake.kr>
Date: Tue, 8 Apr 2014 03:37:28 +0900
Subject: [PATCH 12/44] =?UTF-8?q?=EC=98=A4=ED=83=80=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/extravar/Extravar.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index bfa3da383..1ac8df814 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -424,7 +424,7 @@ class ExtraItem
 				Context::loadJavascriptPlugin('ui.datepicker');
 
 				$buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />'; 
-				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />'
+				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />';
 				$buff[] =	'<input type="button" value="' . Context::getLang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
 				$buff[] =	'<script type="text/javascript">';
 				$buff[] = '//<![CDATA[';

From 127fca81e006432d763a1c3674c18a8ab0a963c2 Mon Sep 17 00:00:00 2001
From: SMaker <dowon2308@gmail.com>
Date: Mon, 14 Apr 2014 18:50:32 +0900
Subject: [PATCH 13/44] =?UTF-8?q?=EC=9C=84=EC=A0=AF=20=EC=BA=90=EC=8B=B1?=
 =?UTF-8?q?=20=EC=84=A4=EC=A0=95=20=EC=8B=9C=20memcache=EB=82=98=20apc?=
 =?UTF-8?q?=EC=97=90=20=EC=A0=80=EC=9E=A5=ED=95=A0=20=EC=88=98=20=EC=9E=88?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/widget/widget.controller.php | 73 ++++++++++++++++++----------
 1 file changed, 48 insertions(+), 25 deletions(-)

diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index 8c6587b9d..613ea39d3 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -374,35 +374,58 @@ class widgetController extends widget
 			return $widget_content;
 		}
 
-		/**
-		 * Cache number and cache values are set so that the cache file should call
-		 */
-		FileHandler::makeDir($this->cache_path);
-		// Wanted cache file
-		$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $widget_sequence, $lang_type);
-		// If the file exists in the cache, the file validation
-		if(!$ignore_cache && file_exists($cache_file))
+		$oCacheHandler = CacheHandler::getInstance('template');
+		if($oCacheHandler->isSupport())
 		{
-			$filemtime = filemtime($cache_file);
-			// Should be modified compared to the time of the cache or in the future if creating more than widget.controller.php file a return value of the cache
-			if($filemtime + $widget_cache * 60 > $_SERVER['REQUEST_TIME'] && $filemtime > filemtime(_XE_PATH_.'modules/widget/widget.controller.php'))
-			{
-				$cache_body = FileHandler::readFile($cache_file);
-				$cache_body = preg_replace('@<\!--#Meta:@', '<!--Meta:', $cache_body);
+			$key = 'widget_cache:' . $widget_sequence;
 
-				return $cache_body;
+			$cache_body = $oCacheHandler->get($key);
+			$cache_body = preg_replace('@<\!--#Meta:@', '<!--Meta:', $cache_body);
+		}
+
+		if($cache_body)
+		{
+			return $cache_body;
+		}
+		else
+		{
+			/**
+			 * Cache number and cache values are set so that the cache file should call
+			 */
+			FileHandler::makeDir($this->cache_path);
+			// Wanted cache file
+			$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $widget_sequence, $lang_type);
+			// If the file exists in the cache, the file validation
+			if(!$ignore_cache && file_exists($cache_file))
+			{
+				$filemtime = filemtime($cache_file);
+				// Should be modified compared to the time of the cache or in the future if creating more than widget.controller.php file a return value of the cache
+				if($filemtime + $widget_cache * 60 > $_SERVER['REQUEST_TIME'] && $filemtime > filemtime(_XE_PATH_.'modules/widget/widget.controller.php'))
+				{
+					$cache_body = FileHandler::readFile($cache_file);
+					$cache_body = preg_replace('@<\!--#Meta:@', '<!--Meta:', $cache_body);
+
+					return $cache_body;
+				}
+			}
+			// cache update and cache renewal of the file mtime
+			touch($cache_file);
+
+			$oWidget = $this->getWidgetObject($widget);
+			if(!$oWidget || !method_exists($oWidget,'proc')) return;
+
+			$widget_content = $oWidget->proc($args);
+			$oModuleController = getController('module');
+			$oModuleController->replaceDefinedLangCode($widget_content);
+			if($oCacheHandler->isSupport())
+			{
+				$oCacheHandler->put($key, $widget_content, $widget_cache * 60);
+			}
+			else
+			{
+				FileHandler::writeFile($cache_file, $widget_content);
 			}
 		}
-		// cache update and cache renewal of the file mtime
-		touch($cache_file);
-
-		$oWidget = $this->getWidgetObject($widget);
-		if(!$oWidget || !method_exists($oWidget,'proc')) return;
-
-		$widget_content = $oWidget->proc($args);
-		$oModuleController = getController('module');
-		$oModuleController->replaceDefinedLangCode($widget_content);
-		FileHandler::writeFile($cache_file, $widget_content);
 
 		return $widget_content;
 	}

From 95322d2b5d11526a39acdd9e6d3ecd05516872a7 Mon Sep 17 00:00:00 2001
From: SMaker <dowon2308@gmail.com>
Date: Mon, 14 Apr 2014 23:02:32 +0900
Subject: [PATCH 14/44] =?UTF-8?q?moduleModel::getModuleActionXmlInfo()?=
 =?UTF-8?q?=EB=A5=BC=20memcache=EB=82=98=20apc=EB=A1=9C=20=EC=BA=90?=
 =?UTF-8?q?=EC=8B=B1=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/module/module.model.php | 421 ++++++++++++++++++--------------
 1 file changed, 240 insertions(+), 181 deletions(-)

diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index dc551bad5..740e95934 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -817,190 +817,249 @@ class moduleModel extends module
 		$xml_file = sprintf("%sconf/module.xml", $class_path);
 		if(!file_exists($xml_file)) return;
 
-		// Check if cached file exists
-		$cache_file = sprintf(_XE_PATH_ . "files/cache/module_info/%s.%s.%s.php", $module, Context::getLangType(), __XE_VERSION__);
-
-		// Update if no cache file exists or it is older than xml file
-		if(!file_exists($cache_file) || filemtime($cache_file) < filemtime($xml_file) || $re_cache)
+		$oCacheHandler = CacheHandler::getInstance('object');
+		if($oCacheHandler->isSupport())
 		{
-			$info = new stdClass();
-			$buff = array(); // /< Set buff variable to use in the cache file
-			$buff[] = '<?php if(!defined("__XE__")) exit();';
-			$buff[] = '$info = new stdClass;';
-			$buff['default_index_act'] = '$info->default_index_act = \'%s\';';
-			$buff['setup_index_act'] = '$info->setup_index_act=\'%s\';';
-			$buff['simple_setup_index_act'] = '$info->simple_setup_index_act=\'%s\';';
-			$buff['admin_index_act'] = '$info->admin_index_act = \'%s\';';
-
-			$xml_obj = XmlParser::loadXmlFile($xml_file); // /< Read xml file and convert it to xml object
-
-			if(!count($xml_obj->module)) return; // /< Error occurs if module tag doesn't included in the xml
-
-			$grants = $xml_obj->module->grants->grant; // /< Permission information
-			$permissions = $xml_obj->module->permissions->permission; // /<  Acting permission
-			$menus = $xml_obj->module->menus->menu;
-			$actions = $xml_obj->module->actions->action; // /< Action list (required)
-
-			$default_index = $admin_index = '';
-
-			// Arrange permission information
-			if($grants)
-			{
-				if(is_array($grants)) $grant_list = $grants;
-				else $grant_list[] = $grants;
-
-				$info->grant = new stdClass();
-				$buff[] = '$info->grant = new stdClass;';
-				foreach($grant_list as $grant)
-				{
-					$name = $grant->attrs->name;
-					$default = $grant->attrs->default?$grant->attrs->default:'guest';
-					$title = $grant->title->body;
-
-					$info->grant->{$name} = new stdClass();
-					$info->grant->{$name}->title = $title;
-					$info->grant->{$name}->default = $default;
-
-					$buff[] = sprintf('$info->grant->%s = new stdClass;', $name);
-					$buff[] = sprintf('$info->grant->%s->title=\'%s\';', $name, $title);
-					$buff[] = sprintf('$info->grant->%s->default=\'%s\';', $name, $default);
-				}
-			}
-			// Permissions to grant
-			if($permissions)
-			{
-				if(is_array($permissions)) $permission_list = $permissions;
-				else $permission_list[] = $permissions;
-
-				$buff[] = '$info->permission = new stdClass;';
-
-				$info->permission = new stdClass();
-				foreach($permission_list as $permission)
-				{
-					$action = $permission->attrs->action;
-					$target = $permission->attrs->target;
-
-					$info->permission->{$action} = $target;
-
-					$buff[] = sprintf('$info->permission->%s = \'%s\';', $action, $target);
-				}
-			}
-			// for admin menus
-			if($menus)
-			{
-				if(is_array($menus)) $menu_list = $menus;
-				else $menu_list[] = $menus;
-
-				$buff[] = '$info->menu = new stdClass;';
-				$info->menu = new stdClass();
-				foreach($menu_list as $menu)
-				{
-					$menu_name = $menu->attrs->name;
-					$menu_title = is_array($menu->title) ? $menu->title[0]->body : $menu->title->body;
-					$menu_type = $menu->attrs->type;
-
-					$info->menu->{$menu_name} = new stdClass();
-					$info->menu->{$menu_name}->title = $menu_title;
-					$info->menu->{$menu_name}->acts = array();
-					$info->menu->{$menu_name}->type = $menu_type;
-
-					$buff[] = sprintf('$info->menu->%s = new stdClass;', $menu_name);
-					$buff[] = sprintf('$info->menu->%s->title=\'%s\';', $menu_name, $menu_title);
-					$buff[] = sprintf('$info->menu->%s->type=\'%s\';', $menu_name, $menu_type);
-				}
-			}
-
-			// actions
-			if($actions)
-			{
-				if(is_array($actions)) $action_list = $actions;
-				else $action_list[] = $actions;
-
-				$buff[] = '$info->action = new stdClass;';
-				$info->action = new stdClass();
-				foreach($action_list as $action)
-				{
-					$name = $action->attrs->name;
-
-					$type = $action->attrs->type;
-					$grant = $action->attrs->grant?$action->attrs->grant:'guest';
-					$standalone = $action->attrs->standalone=='false'?'false':'true';
-					$ruleset = $action->attrs->ruleset?$action->attrs->ruleset:'';
-					$method = $action->attrs->method?$action->attrs->method:'';
-
-					$index = $action->attrs->index;
-					$admin_index = $action->attrs->admin_index;
-					$setup_index = $action->attrs->setup_index;
-					$simple_setup_index = $action->attrs->simple_setup_index;
-					$menu_index = $action->attrs->menu_index;
-
-					$info->action->{$name} = new stdClass();
-					$info->action->{$name}->type = $type;
-					$info->action->{$name}->grant = $grant;
-					$info->action->{$name}->standalone = ($standalone == 'true') ? TRUE : FALSE;
-					$info->action->{$name}->ruleset = $ruleset;
-					$info->action->{$name}->method = $method;
-					if($action->attrs->menu_name)
-					{
-						if($menu_index == 'true')
-						{
-							$info->menu->{$action->attrs->menu_name}->index = $name;
-							$buff[] = sprintf('$info->menu->%s->index=\'%s\';', $action->attrs->menu_name, $name);
-						}
-						if(is_array($info->menu->{$action->attrs->menu_name}->acts))
-						{
-							$info->menu->{$action->attrs->menu_name}->acts[] = $name;
-							$currentKey = array_search($name, $info->menu->{$action->attrs->menu_name}->acts);
-						}
-
-						$buff[] = sprintf('$info->menu->%s->acts[%d]=\'%s\';', $action->attrs->menu_name, $currentKey, $name);
-						$i++;
-					}
-
-					$buff[] = sprintf('$info->action->%s = new stdClass;', $name);
-					$buff[] = sprintf('$info->action->%s->type=\'%s\';', $name, $type);
-					$buff[] = sprintf('$info->action->%s->grant=\'%s\';', $name, $grant);
-					$buff[] = sprintf('$info->action->%s->standalone=\'%s\';', $name, $standalone);
-					$buff[] = sprintf('$info->action->%s->ruleset=\'%s\';', $name, $ruleset);
-					$buff[] = sprintf('$info->action->%s->method=\'%s\';', $name, $method);
-
-					if($index=='true')
-					{
-						$default_index_act = $name;
-						$info->default_index_act = $name;
-					}
-					if($admin_index=='true')
-					{
-						$admin_index_act = $name;
-						$info->admin_index_act = $name;
-					}
-					if($setup_index=='true')
-					{
-						$setup_index_act = $name;
-						$info->setup_index_act = $name;
-					}
-					if($simple_setup_index=='true')
-					{
-						$simple_setup_index_act = $name;
-						$info->simple_setup_index_act = $name;
-					}
-				}
-			}
-			$buff['default_index_act'] = sprintf($buff['default_index_act'], $default_index_act);
-			$buff['setup_index_act'] = sprintf($buff['setup_index_act'], $setup_index_act);
-			$buff['simple_setup_index_act'] = sprintf($buff['simple_setup_index_act'], $simple_setup_index_act);
-			$buff['admin_index_act'] = sprintf($buff['admin_index_act'], $admin_index_act);
-
-			$buff[] = 'return $info;';
-
-			$buff = implode(PHP_EOL, $buff);
-
-			FileHandler::writeFile($cache_file, $buff);
-
-			return $info;
+			$object_key = 'module:' . $module . '_' . Context::getLangType() . '_' . __XE_VERSION__;
+			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
+			$info = $oCacheHandler->get($cache_key);
 		}
 
-		if(file_exists($cache_file)) return include($cache_file);
+		if($info)
+		{
+			return $info;
+		}
+		else
+		{
+			// Check if cached file exists
+			$cache_file = sprintf(_XE_PATH_ . "files/cache/module_info/%s.%s.%s.php", $module, Context::getLangType(), __XE_VERSION__);
+
+			// Update if no cache file exists or it is older than xml file
+			if($oCacheHandler->isSupport() || (!file_exists($cache_file) || filemtime($cache_file) < filemtime($xml_file) || $re_cache))
+			{
+				$info = new stdClass();
+				if(!$oCacheHandler->isSupport())
+				{
+					$buff = array(); // /< Set buff variable to use in the cache file
+					$buff[] = '<?php if(!defined("__XE__")) exit();';
+					$buff[] = '$info = new stdClass;';
+					$buff['default_index_act'] = '$info->default_index_act = \'%s\';';
+					$buff['setup_index_act'] = '$info->setup_index_act=\'%s\';';
+					$buff['simple_setup_index_act'] = '$info->simple_setup_index_act=\'%s\';';
+					$buff['admin_index_act'] = '$info->admin_index_act = \'%s\';';
+				}
+
+				$xml_obj = XmlParser::loadXmlFile($xml_file); // /< Read xml file and convert it to xml object
+
+				if(!count($xml_obj->module)) return; // /< Error occurs if module tag doesn't included in the xml
+
+				$grants = $xml_obj->module->grants->grant; // /< Permission information
+				$permissions = $xml_obj->module->permissions->permission; // /<  Acting permission
+				$menus = $xml_obj->module->menus->menu;
+				$actions = $xml_obj->module->actions->action; // /< Action list (required)
+
+				$default_index = $admin_index = '';
+
+				// Arrange permission information
+				if($grants)
+				{
+					if(is_array($grants)) $grant_list = $grants;
+					else $grant_list[] = $grants;
+
+					$info->grant = new stdClass();
+					if(!$oCacheHandler->isSupport())
+					{
+						$buff[] = '$info->grant = new stdClass;';
+					}
+					foreach($grant_list as $grant)
+					{
+						$name = $grant->attrs->name;
+						$default = $grant->attrs->default?$grant->attrs->default:'guest';
+						$title = $grant->title->body;
+
+						$info->grant->{$name} = new stdClass();
+						$info->grant->{$name}->title = $title;
+						$info->grant->{$name}->default = $default;
+
+						if(!$oCacheHandler->isSupport())
+						{
+							$buff[] = sprintf('$info->grant->%s = new stdClass;', $name);
+							$buff[] = sprintf('$info->grant->%s->title=\'%s\';', $name, $title);
+							$buff[] = sprintf('$info->grant->%s->default=\'%s\';', $name, $default);
+						}
+					}
+				}
+				// Permissions to grant
+				if($permissions)
+				{
+					if(is_array($permissions)) $permission_list = $permissions;
+					else $permission_list[] = $permissions;
+
+					$buff[] = '$info->permission = new stdClass;';
+
+					$info->permission = new stdClass();
+					foreach($permission_list as $permission)
+					{
+						$action = $permission->attrs->action;
+						$target = $permission->attrs->target;
+
+						$info->permission->{$action} = $target;
+
+						if(!$oCacheHandler->isSupport())
+						{
+							$buff[] = sprintf('$info->permission->%s = \'%s\';', $action, $target);
+						}
+					}
+				}
+				// for admin menus
+				if($menus)
+				{
+					if(is_array($menus)) $menu_list = $menus;
+					else $menu_list[] = $menus;
+
+					if(!$oCacheHandler->isSupport())
+					{
+						$buff[] = '$info->menu = new stdClass;';
+					}
+					$info->menu = new stdClass();
+					foreach($menu_list as $menu)
+					{
+						$menu_name = $menu->attrs->name;
+						$menu_title = is_array($menu->title) ? $menu->title[0]->body : $menu->title->body;
+						$menu_type = $menu->attrs->type;
+
+						$info->menu->{$menu_name} = new stdClass();
+						$info->menu->{$menu_name}->title = $menu_title;
+						$info->menu->{$menu_name}->acts = array();
+						$info->menu->{$menu_name}->type = $menu_type;
+
+						if(!$oCacheHandler->isSupport())
+						{
+							$buff[] = sprintf('$info->menu->%s = new stdClass;', $menu_name);
+							$buff[] = sprintf('$info->menu->%s->title=\'%s\';', $menu_name, $menu_title);
+							$buff[] = sprintf('$info->menu->%s->type=\'%s\';', $menu_name, $menu_type);
+						}
+					}
+				}
+
+				// actions
+				if($actions)
+				{
+					if(is_array($actions)) $action_list = $actions;
+					else $action_list[] = $actions;
+
+					if(!$oCacheHandler->isSupport())
+					{
+						$buff[] = '$info->action = new stdClass;';
+					}
+					$info->action = new stdClass();
+					foreach($action_list as $action)
+					{
+						$name = $action->attrs->name;
+
+						$type = $action->attrs->type;
+						$grant = $action->attrs->grant?$action->attrs->grant:'guest';
+						$standalone = $action->attrs->standalone=='false'?'false':'true';
+						$ruleset = $action->attrs->ruleset?$action->attrs->ruleset:'';
+						$method = $action->attrs->method?$action->attrs->method:'';
+
+						$index = $action->attrs->index;
+						$admin_index = $action->attrs->admin_index;
+						$setup_index = $action->attrs->setup_index;
+						$simple_setup_index = $action->attrs->simple_setup_index;
+						$menu_index = $action->attrs->menu_index;
+
+						$info->action->{$name} = new stdClass();
+						$info->action->{$name}->type = $type;
+						$info->action->{$name}->grant = $grant;
+						$info->action->{$name}->standalone = ($standalone == 'true') ? TRUE : FALSE;
+						$info->action->{$name}->ruleset = $ruleset;
+						$info->action->{$name}->method = $method;
+						if($action->attrs->menu_name)
+						{
+							if($menu_index == 'true')
+							{
+								$info->menu->{$action->attrs->menu_name}->index = $name;
+								if(!$oCacheHandler->isSupport())
+								{
+									$buff[] = sprintf('$info->menu->%s->index=\'%s\';', $action->attrs->menu_name, $name);
+								}
+							}
+							if(is_array($info->menu->{$action->attrs->menu_name}->acts))
+							{
+								$info->menu->{$action->attrs->menu_name}->acts[] = $name;
+								$currentKey = array_search($name, $info->menu->{$action->attrs->menu_name}->acts);
+							}
+
+							if(!$oCacheHandler->isSupport())
+							{
+								$buff[] = sprintf('$info->menu->%s->acts[%d]=\'%s\';', $action->attrs->menu_name, $currentKey, $name);
+							}
+							$i++;
+						}
+
+						if(!$oCacheHandler->isSupport())
+						{
+							$buff[] = sprintf('$info->action->%s = new stdClass;', $name);
+							$buff[] = sprintf('$info->action->%s->type=\'%s\';', $name, $type);
+							$buff[] = sprintf('$info->action->%s->grant=\'%s\';', $name, $grant);
+							$buff[] = sprintf('$info->action->%s->standalone=\'%s\';', $name, $standalone);
+							$buff[] = sprintf('$info->action->%s->ruleset=\'%s\';', $name, $ruleset);
+							$buff[] = sprintf('$info->action->%s->method=\'%s\';', $name, $method);
+						}
+
+						if($index=='true')
+						{
+							$default_index_act = $name;
+							$info->default_index_act = $name;
+						}
+						if($admin_index=='true')
+						{
+							$admin_index_act = $name;
+							$info->admin_index_act = $name;
+						}
+						if($setup_index=='true')
+						{
+							$setup_index_act = $name;
+							$info->setup_index_act = $name;
+						}
+						if($simple_setup_index=='true')
+						{
+							$simple_setup_index_act = $name;
+							$info->simple_setup_index_act = $name;
+						}
+					}
+				}
+				if(!$oCacheHandler->isSupport())
+				{
+					$buff['default_index_act'] = sprintf($buff['default_index_act'], $default_index_act);
+					$buff['setup_index_act'] = sprintf($buff['setup_index_act'], $setup_index_act);
+					$buff['simple_setup_index_act'] = sprintf($buff['simple_setup_index_act'], $simple_setup_index_act);
+					$buff['admin_index_act'] = sprintf($buff['admin_index_act'], $admin_index_act);
+
+					$buff[] = 'return $info;';
+				}
+
+				if($oCacheHandler->isSupport())
+				{
+					$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
+					$oCacheHandler->put($cache_key, $info);
+				}
+				else
+				{
+					$buff = implode(PHP_EOL, $buff);
+
+					FileHandler::writeFile($cache_file, $buff);
+				}
+
+				return $info;
+			}
+
+			if(!$oCacheHandler->isSupport() && file_exists($cache_file))
+			{
+				return include($cache_file);
+			}
+		}
 	}
 
 	/**

From 04199bf9d98faababb13985ee0c878c8374d894f Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 15 Apr 2014 17:19:10 +0900
Subject: [PATCH 15/44] =?UTF-8?q?Revert=20"=EC=98=A4=ED=83=80=EC=88=98?=
 =?UTF-8?q?=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 75ddf5acd2a71f14cb97c18643f1801127dfb851.
---
 classes/extravar/Extravar.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index 1ac8df814..bfa3da383 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -424,7 +424,7 @@ class ExtraItem
 				Context::loadJavascriptPlugin('ui.datepicker');
 
 				$buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />'; 
-				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />';
+				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />'
 				$buff[] =	'<input type="button" value="' . Context::getLang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
 				$buff[] =	'<script type="text/javascript">';
 				$buff[] = '//<![CDATA[';

From 41755c1e9fc408df920d5977c6362e26c53a0cbc Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 15 Apr 2014 17:19:24 +0900
Subject: [PATCH 16/44] =?UTF-8?q?Revert=20"date=EB=B0=A9=EC=8B=9D=EC=9D=98?=
 =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=ED=8F=BC=20=EC=95=88=EC=9D=98=20button?=
 =?UTF-8?q?=EC=9D=98=20class=EC=B6=94=EA=B0=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 239b07232dce0b6d43c5bb39a74d36d3695c7b15.
---
 classes/extravar/Extravar.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index bfa3da383..df235ca97 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -424,8 +424,7 @@ class ExtraItem
 				Context::loadJavascriptPlugin('ui.datepicker');
 
 				$buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />'; 
-				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />'
-				$buff[] =	'<input type="button" value="' . Context::getLang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
+				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" /> <input type="button" value="' . Context::getLang('cmd_delete') . '" id="dateRemover_' . $column_name . '" />';
 				$buff[] =	'<script type="text/javascript">';
 				$buff[] = '//<![CDATA[';
 				$buff[] =	'(function($){';

From 60306f2040aee67be52979df916270588bdae25e Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 15 Apr 2014 17:19:31 +0900
Subject: [PATCH 17/44] Revert "remove spaces in checkbox, radio, select types
 inputbox"

This reverts commit 996e03bc284020ca8747c1c54429c46336480af0.
---
 classes/extravar/Extravar.class.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index df235ca97..e56cc1517 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -249,7 +249,7 @@ class ExtraItem
 
 				for($i = 0, $c = count($values); $i < $c; $i++)
 				{
-					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+					$values[$i] = htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 				}
 
 				return $values;
@@ -306,15 +306,21 @@ class ExtraItem
 			case 'textarea' :
 				return nl2br($value);
 				
+			case 'checkbox' :
+				if(is_array($value))
+				{
+					return implode(', ', $value);
+				}
+				return $value;
+				
 			case 'date' :
 				return zdate($value, "Y-m-d");
 
-			case 'checkbox' :
 			case 'select' :
 			case 'radio' :
 				if(is_array($value))
 				{
-					return implode(',', $value);
+					return implode(', ', $value);
 				}
 				return $value;
 

From 8b2ed49d109b48195bbbc0e938017603cce03daa Mon Sep 17 00:00:00 2001
From: upgle <admin@upgle.com>
Date: Sat, 19 Apr 2014 22:19:36 +0545
Subject: [PATCH 18/44] =?UTF-8?q?metaWeblog=20API=EC=A4=91=20=EC=B5=9C?=
 =?UTF-8?q?=EC=8B=A0=EA=B8=80=20=EB=AA=BB=EB=B6=88=EB=9F=AC=EC=98=A4?=
 =?UTF-8?q?=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CDATA 타입 추가 및 XML description 부분 CDATA로 처리.
---
 addons/blogapi/blogapi.addon.php | 2 +-
 addons/blogapi/blogapi.func.php  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/blogapi/blogapi.addon.php b/addons/blogapi/blogapi.addon.php
index 2fe2de290..45ccfffa6 100644
--- a/addons/blogapi/blogapi.addon.php
+++ b/addons/blogapi/blogapi.addon.php
@@ -487,7 +487,7 @@ if($called_position == 'before_module_proc')
 					$post = new stdClass();
 					$post->categories = array();
 					$post->dateCreated = date("Ymd", $oDocument->getRegdateTime()) . 'T' . date("H:i:s", $oDocument->getRegdateTime());
-					$post->description = htmlspecialchars($oEditorController->transComponent($oDocument->getContent(false, false, true, false)), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+					$post->description = sprintf('<![CDATA[%s]]>',$oEditorController->transComponent($oDocument->getContent(false, false, true, false)));
 					$post->link = $post->permaLink = getFullUrl('', 'document_srl', $oDocument->document_srl);
 					$post->postid = $oDocument->document_srl;
 					$post->title = htmlspecialchars($oDocument->get('title'), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
diff --git a/addons/blogapi/blogapi.func.php b/addons/blogapi/blogapi.func.php
index adc3c66f6..06cc06c84 100644
--- a/addons/blogapi/blogapi.func.php
+++ b/addons/blogapi/blogapi.func.php
@@ -31,7 +31,11 @@ function getXmlRpcResponse($params)
 // Encoding
 function _getEncodedVal($val, $is_sub_set = false)
 {
-	if(is_int($val))
+	if(preg_match('/^\<\!\[CDATA\[/',$val))
+	{
+		$buff = sprintf("<value>%s</value>", $val);
+	}
+	elseif(is_int($val))
 	{
 		$buff = sprintf("<value><i4>%d</i4></value>", $val);
 	}

From 40d92fb6f4ea8ac90fdce4f10d91cd2f479bfae9 Mon Sep 17 00:00:00 2001
From: upgle <admin@upgle.com>
Date: Sat, 19 Apr 2014 22:53:47 +0545
Subject: [PATCH 19/44] =?UTF-8?q?BLOG=20API=20=EC=9A=94=EC=B2=AD=EA=B0=92?=
 =?UTF-8?q?=EC=9D=B4=20=EC=97=86=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20500?=
 =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EB=8C=80=EC=8B=A0=20=EC=97=90=EB=9F=AC?=
 =?UTF-8?q?=EB=A9=94=EC=84=B8=EC=A7=80=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

XE BLOG API 주소를 URL을 통해 직접 접속했을 때.
http://localhost/mid/api

기존
HTTP_RAW_POST_DATA값이 NULL이기 때문에 500페이지 출력.
(사용자로 하여금 연산 에러 메세지 출력으로 API 자체 오류로 보일 수 있음)

수정
Invalid Method Call 메세지 출력
(사용자로 하여금 API 페이지임을 알려줌)
---
 addons/blogapi/blogapi.addon.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/blogapi/blogapi.addon.php b/addons/blogapi/blogapi.addon.php
index 45ccfffa6..d78bf0eb7 100644
--- a/addons/blogapi/blogapi.addon.php
+++ b/addons/blogapi/blogapi.addon.php
@@ -30,6 +30,13 @@ if($_REQUEST['act'] != 'api')
 // Read func file
 require_once(_XE_PATH_ . 'addons/blogapi/blogapi.func.php');
 
+// If HTTP_RAW_POST_DATA is NULL, Print error message
+if(!$GLOBALS['HTTP_RAW_POST_DATA'])
+{
+	$content = getXmlRpcFailure(1, 'Invalid Method Call');
+	printContent($content);
+}
+
 // xmlprc parsing
 // Parse the requested xmlrpc
 $xml = new SimpleXMLElement($GLOBALS['HTTP_RAW_POST_DATA']);

From 403bb16bdc9dfd9e73e5a4e8759854c324f1fd9f Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Mon, 28 Apr 2014 16:47:29 +0900
Subject: [PATCH 20/44] update README.md

---
 CONTRIBUTING.md | 25 +++++++++++++++++++++++++
 README.md       | 44 +++++++++++++++++++++++++++++++-------------
 2 files changed, 56 insertions(+), 13 deletions(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..ae1039e7b
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,25 @@
+# Contribution Guide
+
+## Issue 작성
+Issue 작성 시 참고해주세요.
+
+* 작성하려는 이슈가 이미 있는지 검색 후 등록해주세요. 비슷한 이슈가 있다면 댓글로 추가 내용을 덧붙일 수 있습니다.
+* 이슈에는 하나의 문제 또는 제안을 작성해주세요. 절대 하나의 이슈에 2개 이상의 내용을 적지마세요.
+* 이슈는 가능한 상세하고 간결하게 작성해주세요
+	* 필요하다면 화면을 캡쳐하여 이미지를 업로드할 수 있습니다
+
+## Pull request(PR)
+* `master` 브랜치의 코드는 수정하지마세요
+* PR은 `develop` 브랜치만 허용합니다.
+* `develop` 브랜치를 부모로한 토픽 브랜치를 활용하면 편리합니다.
+
+
+## Coding Guidelines
+코드를 기여할 때 Coding conventions을 따라야합니다.
+
+* 모든 text 파일의 charset은 BOM이 없는 UTF-8입니다
+* newline은 UNIX type을 사용합니다. 일부 파일이 다른 type을 사용하더라도 절대 고치지 마세요!
+* 들여쓰기는 1개의 탭으로 합니다
+* class 선언과 function, if, foreach, for, while 등 중괄호의 `{}`는 다음 줄에 있어야 합니다
+	* 마찬가지로 선언 다음에는 공백을 두지 않습니다. ex) CORRECT `if(...)`, INCORRECT `if (...)`
+* **Coding convention에 맞지 않는 코드를 발견 하더라도 목적과 관계 없는 코드는 절대 고치지 마세요**
diff --git a/README.md b/README.md
index d82a721ce..702176abd 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,39 @@
-# XpressEngine
+XpressEngine
+============
+
+[![Build Status](https://travis-ci.org/xpressengine/xe-core.svg?branch=master)](https://travis-ci.org/xpressengine/xe-core)
+[![License](http://img.shields.io/badge/license-GNU%20LGPL-brightgreen.svg)](http://www.gnu.org/licenses/gpl.html)
+[![Latest release](http://img.shields.io/github/release/xpressengine/xe-core.svg)](https://github.com/xpressengine/xe-core/releases)
+
+XpressEngine(XE)은 PHP로 작성한 CMS(Content Management System)입니다.
+
+
+오픈소스 라이선스로 누구나 사용 또는 개작할 수 있으며, 개방형 프로젝트로서 누구나 개발에 참여할 수 있습니다.
+
+## Supprot
+* Official sitie (Korean) : http://www.xpressengine.com/
+
+## Maintainers
+@akasima @bnu @jhyeon1010 @khongchi @ngleader
 
 ## Authors
-adrian.vasile.constantin, aerofleet, @akasima, @andreimarin, araste, @bnu, bradly1, buffkj, c2joy, @canto, cbrghost, @ccata17, @ChanMyeong, chinaskyking, chschy, clench, @devjin, @dionisrom, @dorami, @dragan-dan, ducduydaovn, duvent, @Eundong, @florinutz, @flourscent, @flyskyko, @ForPeople, FruitsHake, guny, @haneul, hankm2004, haojilin, heemin, ikko, johnsonshu, juanlee0, k10206, kagami, @khongchi, @lansi951, @largeden, liahona, lickawtl, mayoojin, mglclub, @misol, mmx900, mooo, mosmartin, @nagoon97, @ngleader, nicetwo, ovclas, risapapa, rokmcssu, royallin, rubyeye, ryin005, sanghunjun, @sejin7940, @SMaker, sspa3141, @stellar12, supershop, @taggon, @ucorina, unryong, venister, wdlee91, welcomeju, @YJSoft, ysnglee2000, zero
+adrian.vasile.constantin, aerofleet, @akasima, @andreimarin, araste, @bnu, @bongkeun, bradly1, buffkj, c2joy, @canto, cbrghost, @ccata17, @ChanMyeong, chinaskyking, chschy, clench, @cometdev, @devdho, @devjin, @dionisrom, @dorami, @dragan-dan, ducduydaovn, duvent, @Eundong, @florinutz, @flourscent, @flyskyko, @ForPeople, FruitsHake, guny, @haneul, hankm2004, @hansim, haojilin, heemin, @hyeon0142, ikko, @izuzero, johnsonshu, juanlee0, k10206, kagami, @khongchi, @lansi951, @largeden, liahona, lickawtl, @mAKEkr, mayoojin, mglclub, @misol, mmx900, @mog422, mooo, mosmartin, @nagoon97, @ngleader, nicetwo, ovclas, @qw5414, @Rayyin, risapapa, rokmcssu, royallin, rubyeye, ryin005, @samswnlee, sanghunjun, @sejin7940, @smaker, @solidh, sspa3141, @stellar12, supershop, @taggon, @ucorina, unryong, venister, wdlee91, welcomeju, @YJSoft, ysnglee2000, zero
+
+## Contribution Guide
+`CONTRIBUTING.md`파일을 참고하세요.
 
 ## License
-Copyright (C) NAVER <http://www.navercorp.com>
+Copyright (C) NAVER Corp. <http://www.navercorp.com>
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-This library is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

From 1ae3e755479b2422057c40052d43b20b1304574c Mon Sep 17 00:00:00 2001
From: SMaker <dowon2308@gmail.com>
Date: Mon, 28 Apr 2014 21:52:19 +0900
Subject: [PATCH 21/44] =?UTF-8?q?Captcha=20=EC=95=A0=EB=93=9C=EC=98=A8?=
 =?UTF-8?q?=EC=9D=84=20=ED=82=A4=EB=A9=B4=20PC=EC=97=90=EC=84=9C=20jquery?=
 =?UTF-8?q?=EB=A5=BC=20=EC=A4=91=EB=B3=B5=20=EB=A1=9C=EB=93=9C=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/captcha/captcha.addon.php               | 7 +++++--
 addons/captcha_member/captcha_member.addon.php | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/captcha/captcha.addon.php b/addons/captcha/captcha.addon.php
index a03a9d847..f57024704 100644
--- a/addons/captcha/captcha.addon.php
+++ b/addons/captcha/captcha.addon.php
@@ -12,8 +12,11 @@ if(!defined("__XE__")) exit();
 if(!class_exists('AddonCaptcha', false))
 {
 	// On the mobile mode, XE Core does not load jquery and xe.js as normal.
-	Context::loadFile(array('./common/js/jquery.min.js', 'head', NULL, -100000), true);
-	Context::loadFile(array('./common/js/xe.min.js', 'head', NULL, -100000), true);
+	if(Mobile::isFromMobilePhone())
+	{
+		Context::loadFile(array('./common/js/jquery.min.js', 'head', NULL, -100000), true);
+		Context::loadFile(array('./common/js/xe.min.js', 'head', NULL, -100000), true);
+	}
 
 	class AddonCaptcha
 	{
diff --git a/addons/captcha_member/captcha_member.addon.php b/addons/captcha_member/captcha_member.addon.php
index 211fd8687..e56393f32 100644
--- a/addons/captcha_member/captcha_member.addon.php
+++ b/addons/captcha_member/captcha_member.addon.php
@@ -12,8 +12,11 @@ if(!defined("__XE__")) exit();
 if(!class_exists('AddonMemberCaptcha', false))
 {
 	// On the mobile mode, XE Core does not load jquery and xe.js as normal.
-	Context::loadFile(array('./common/js/jquery.min.js', 'head', NULL, -100000), true);
-	Context::loadFile(array('./common/js/xe.min.js', 'head', NULL, -100000), true);
+	if(Mobile::isFromMobilePhone())
+	{
+		Context::loadFile(array('./common/js/jquery.min.js', 'head', NULL, -100000), true);
+		Context::loadFile(array('./common/js/xe.min.js', 'head', NULL, -100000), true);
+	}
 
 	class AddonMemberCaptcha
 	{

From a11a19fcffa668ad65f0164178105220f331789b Mon Sep 17 00:00:00 2001
From: BJRambo <sosifam@070805.co.kr>
Date: Tue, 29 Apr 2014 08:16:34 +0900
Subject: [PATCH 22/44] =?UTF-8?q?#667=20=ED=8F=AC=EC=9D=B8=ED=8A=B8?=
 =?UTF-8?q?=EC=97=90=20'0'=EC=9D=84=20=EC=84=A4=EC=A0=95=20=ED=95=A0=20?=
 =?UTF-8?q?=EC=88=98=20=EC=97=86=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20=EA=B0=9C?=
 =?UTF-8?q?=EC=84=A0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/point/ruleset/updatePoint.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/point/ruleset/updatePoint.xml b/modules/point/ruleset/updatePoint.xml
index a7d95de8a..58285a1d5 100644
--- a/modules/point/ruleset/updatePoint.xml
+++ b/modules/point/ruleset/updatePoint.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ruleset version="1.5.0">
     <customrules>
-		<rule name="number_with_plus_minus" type="regex" test="/^(\+|-)?[1-9][0-9]*$/"  />
+		<rule name="number_with_plus_minus" type="regex" test="/^(\+|-)?[0-9][0-9]*$/"  />
     </customrules>
     <fields>
 		<field name="member_srl" required="true" rule="number" />

From a93f332ad69f08989464e2534693ecc6e565e921 Mon Sep 17 00:00:00 2001
From: BJRambo <sosifam@070805.co.kr>
Date: Tue, 29 Apr 2014 08:43:35 +0900
Subject: [PATCH 23/44] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20admin?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=A0=91=EA=B7=BC=EC=8B=9C=20?=
 =?UTF-8?q?=EC=A7=81=EA=B4=80=EC=A0=81=EC=9D=B4=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EC=9D=80=20=EB=A9=94=EB=89=B4=20=EC=95=84=EC=9D=B4=EC=BD=98=20?=
 =?UTF-8?q?=EC=A7=81=EA=B4=80=EC=A0=81=EC=9C=BC=EB=A1=9C=20=ED=91=9C?=
 =?UTF-8?q?=EA=B8=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

모바일에서 잘보이지 않은 아이콘을 잘보일 수 있도록 만들었습니다.
---
 modules/admin/tpl/css/admin.bootstrap.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/admin/tpl/css/admin.bootstrap.css b/modules/admin/tpl/css/admin.bootstrap.css
index 9e2ac1360..2671cfa6c 100644
--- a/modules/admin/tpl/css/admin.bootstrap.css
+++ b/modules/admin/tpl/css/admin.bootstrap.css
@@ -751,7 +751,7 @@
 .x [class^="x_icon-"], 
 .x [class*=" x_icon-"]{display:inline-block;width:14px;height:14px;margin-top:1px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}
 /* White icons with optional class, or on hover/active states of certain elements */
-.x .x_icon-white, 
+#gnb.gnb.open .x_icon-white, 
 .x .x_nav-pills>.x_active>a>[class^="x_icon-"], 
 .x .x_nav-pills>.x_active>a>[class*=" x_icon-"], 
 .x .x_nav-list>.x_active>a>[class^="x_icon-"], 
@@ -1591,4 +1591,4 @@ to{background-position:0 0}
 .x .x_hide{display:none}
 .x .x_show{display:block}
 .x .x_invisible{visibility:hidden}
-.x .x_affix{position:fixed}
\ No newline at end of file
+.x .x_affix{position:fixed}

From c1787592794384b4d59a216ed21cccdeb34af041 Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Wed, 30 Apr 2014 09:37:15 +0900
Subject: [PATCH 24/44] =?UTF-8?q?#680=20http=5Fhost=20=EC=B2=B4=ED=81=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/context/Context.class.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 4b69ac9ff..d47f34e77 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -205,6 +205,9 @@ class Context
 		$this->context->lang = &$GLOBALS['lang'];
 		$this->context->_COOKIE = $_COOKIE;
 
+		// 20140429 editor/image_link
+		$this->_checkGlobalVars();
+
 		$this->setRequestMethod('');
 
 		$this->_setXmlRpcArgument();
@@ -1115,6 +1118,16 @@ class Context
 				($self->request_method = $_SERVER['REQUEST_METHOD']);
 	}
 
+	/**
+	 * handle global arguments
+	 *
+	 * @return void
+	 */
+	function _checkGlobalVars()
+	{
+		$this->_recursiveCheckVar($_SERVER['HTTP_HOST']);
+	}
+
 	/**
 	 * handle request areguments for GET/POST
 	 *

From 873a8dd02453ea4c0f1a1d162e8dc63eb907aab1 Mon Sep 17 00:00:00 2001
From: LI-NA <hyung778@gmail.com>
Date: Thu, 1 May 2014 14:49:26 +0900
Subject: [PATCH 25/44] =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EC=82=BD=EC=9E=85=EC=8B=9C=20=EB=B9=88=20=EC=A4=84?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<p><br /></p>를 이미지 삽입 시 <img /> 다음 줄에 추가.
(사람마다 다르긴 하겠지만, 주요 포털들의 에디터 및 수많은 경우에 이미지 다음에 빈 줄을 삽입하므로, XE에도 적용되면 어떨가 해서 수정했습니다.)
---
 modules/editor/tpl/js/uploader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/editor/tpl/js/uploader.js b/modules/editor/tpl/js/uploader.js
index 3e7b2201b..8321ae3e6 100755
--- a/modules/editor/tpl/js/uploader.js
+++ b/modules/editor/tpl/js/uploader.js
@@ -422,7 +422,7 @@ function insertUploadedFile(editorSequence) {
 				temp_code = '';
 				temp_code += "<img src=\""+file.download_url+"\" alt=\""+file.source_filename+"\"";
 				if(obj.complete === true) { temp_code += " width=\""+obj.width+"\" height=\""+obj.height+"\""; }
-				temp_code += " />\r\n";
+				temp_code += " />\r\n<p><br /></p>\r\n";
 				text.push(temp_code);
 			} else {
 				// 이미지외의 경우는 multimedia_link 컴포넌트 연결

From 3c9894b27cf7f66822ef1bc1f607401a51500dbe Mon Sep 17 00:00:00 2001
From: ngleader <ngleader@gmail.com>
Date: Sat, 3 May 2014 09:08:22 +0900
Subject: [PATCH 26/44] NO-ISSUE, fix typo in README.md

---
 README.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 702176abd..722825333 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,10 @@ XpressEngine
 [![License](http://img.shields.io/badge/license-GNU%20LGPL-brightgreen.svg)](http://www.gnu.org/licenses/gpl.html)
 [![Latest release](http://img.shields.io/github/release/xpressengine/xe-core.svg)](https://github.com/xpressengine/xe-core/releases)
 
-XpressEngine(XE)은 PHP로 작성한 CMS(Content Management System)입니다.
-
-
+XpressEngine(XE)은 PHP로 작성한 설치형 CMS(Content Management System)입니다.
 오픈소스 라이선스로 누구나 사용 또는 개작할 수 있으며, 개방형 프로젝트로서 누구나 개발에 참여할 수 있습니다.
 
-## Supprot
+## Support
 * Official sitie (Korean) : http://www.xpressengine.com/
 
 ## Maintainers
@@ -23,7 +21,7 @@ adrian.vasile.constantin, aerofleet, @akasima, @andreimarin, araste, @bnu, @bong
 `CONTRIBUTING.md`파일을 참고하세요.
 
 ## License
-Copyright (C) NAVER Corp. <http://www.navercorp.com>
+Copyright 2014 NAVER Corp. <http://www.navercorp.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

From a00c33713ef24790669afc4b64ea5a39d3e936bc Mon Sep 17 00:00:00 2001
From: Lansi <eoz754@naver.com>
Date: Tue, 6 May 2014 17:59:46 +0900
Subject: [PATCH 27/44] =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EB=AA=A8=EB=93=88?=
 =?UTF-8?q?=20=EA=B8=B0=EC=A4=80=EC=9C=BC=EB=A1=9C=20=EA=B2=80=EC=83=89=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/board/tpl/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/board/tpl/index.html b/modules/board/tpl/index.html
index e14cf435d..bd403546d 100644
--- a/modules/board/tpl/index.html
+++ b/modules/board/tpl/index.html
@@ -89,6 +89,7 @@
 <form action="" class="search x_input-append center" no-error-return-url="true">
 	<input loop="$param => $key, $val" cond="!in_array($key, array('mid', 'vid', 'act', 'page', 'search_target', 'search_keyword'))" type="hidden" name="{$key}" value="{$val}" />
 	<select cond="count($module_category)" name="module_category_srl" title="{$lang->module_category}" style="margin-right:4px">
+		<option value="" selected="selected"|cond="!$module_category_srl">{$lang->all}</option>
 		<option value="0" selected="selected"|cond="$module_category_srl==='0'">{$lang->not_exists}</option>
 		<option value="{$key}" loop="$module_category => $key,$val"  selected="selected"|cond="$module_category==$key">{$val->title}</option>
 	</select>
@@ -124,4 +125,4 @@ jQuery(function($){
 		}
 	});
 });
-</script>
\ No newline at end of file
+</script>

From 0f72f508e596ef39f8b9b40b7024cb052b63ffce Mon Sep 17 00:00:00 2001
From: Lansi <eoz754@naver.com>
Date: Tue, 6 May 2014 18:01:59 +0900
Subject: [PATCH 28/44] =?UTF-8?q?=EB=AA=A8=EB=93=88=EB=B6=84=EB=A5=98?=
 =?UTF-8?q?=EB=A5=BC=20'=EC=97=86=EC=9D=8C'=20=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=ED=95=B4=EC=84=9C=20=EA=B2=80=EC=83=89=ED=95=98=EB=A9=B4=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=EC=9D=B4=20=EB=B6=88=EA=B0=80=EB=8A=A5?=
 =?UTF-8?q?=ED=95=9C=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/board/queries/getBoardList.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/board/queries/getBoardList.xml b/modules/board/queries/getBoardList.xml
index 06c84bf31..2a5cf6951 100644
--- a/modules/board/queries/getBoardList.xml
+++ b/modules/board/queries/getBoardList.xml
@@ -11,8 +11,8 @@
             <condition operation="like" column="mid" var="s_mid" pipe="or" />
             <condition operation="like" column="browser_title" var="s_browser_title" pipe="or" />
             <condition operation="like" column="comment" var="s_comment" pipe="or" />
-            <condition operation="equal" column="module_category_srl" var="s_module_category_srl" pipe="or" />
         </group>
+        <condition operation="equal" column="module_category_srl" var="s_module_category_srl" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" default="module_srl" order="desc" />

From 6d574552bac7bf90563812dccffb8645c2deb99e Mon Sep 17 00:00:00 2001
From: Lansi <eoz754@naver.com>
Date: Wed, 7 May 2014 16:56:42 +0900
Subject: [PATCH 29/44] =?UTF-8?q?selected=20=EB=90=A0=20=EC=88=98=20?=
 =?UTF-8?q?=EC=9E=88=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

---
 modules/board/tpl/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/board/tpl/index.html b/modules/board/tpl/index.html
index bd403546d..7fb15954a 100644
--- a/modules/board/tpl/index.html
+++ b/modules/board/tpl/index.html
@@ -91,7 +91,7 @@
 	<select cond="count($module_category)" name="module_category_srl" title="{$lang->module_category}" style="margin-right:4px">
 		<option value="" selected="selected"|cond="!$module_category_srl">{$lang->all}</option>
 		<option value="0" selected="selected"|cond="$module_category_srl==='0'">{$lang->not_exists}</option>
-		<option value="{$key}" loop="$module_category => $key,$val"  selected="selected"|cond="$module_category==$key">{$val->title}</option>
+		<option value="{$key}" loop="$module_category => $key,$val"  selected="selected"|cond="$module_category_srl==$key">{$val->title}</option>
 	</select>
 	<select name="search_target" title="{$lang->search_target}" style="margin-right:4px">
 		<option value="mid" selected="selected"|cond="$search_target=='mid'">{$lang->mid}</option>

From bb12d1b9e66b2cd25952ab71dda221bd67ad8fff Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Thu, 8 May 2014 10:29:17 +0900
Subject: [PATCH 30/44] =?UTF-8?q?Revert=20"moduleModel::getModuleActionXml?=
 =?UTF-8?q?Info()=EB=A5=BC=20memcache=EB=82=98=20apc=EB=A1=9C=20=EC=BA=90?=
 =?UTF-8?q?=EC=8B=B1=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 95322d2b5d11526a39acdd9e6d3ecd05516872a7.
---
 modules/module/module.model.php | 417 ++++++++++++++------------------
 1 file changed, 179 insertions(+), 238 deletions(-)

diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index 740e95934..dc551bad5 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -817,249 +817,190 @@ class moduleModel extends module
 		$xml_file = sprintf("%sconf/module.xml", $class_path);
 		if(!file_exists($xml_file)) return;
 
-		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
-		{
-			$object_key = 'module:' . $module . '_' . Context::getLangType() . '_' . __XE_VERSION__;
-			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
-			$info = $oCacheHandler->get($cache_key);
-		}
+		// Check if cached file exists
+		$cache_file = sprintf(_XE_PATH_ . "files/cache/module_info/%s.%s.%s.php", $module, Context::getLangType(), __XE_VERSION__);
 
-		if($info)
+		// Update if no cache file exists or it is older than xml file
+		if(!file_exists($cache_file) || filemtime($cache_file) < filemtime($xml_file) || $re_cache)
 		{
+			$info = new stdClass();
+			$buff = array(); // /< Set buff variable to use in the cache file
+			$buff[] = '<?php if(!defined("__XE__")) exit();';
+			$buff[] = '$info = new stdClass;';
+			$buff['default_index_act'] = '$info->default_index_act = \'%s\';';
+			$buff['setup_index_act'] = '$info->setup_index_act=\'%s\';';
+			$buff['simple_setup_index_act'] = '$info->simple_setup_index_act=\'%s\';';
+			$buff['admin_index_act'] = '$info->admin_index_act = \'%s\';';
+
+			$xml_obj = XmlParser::loadXmlFile($xml_file); // /< Read xml file and convert it to xml object
+
+			if(!count($xml_obj->module)) return; // /< Error occurs if module tag doesn't included in the xml
+
+			$grants = $xml_obj->module->grants->grant; // /< Permission information
+			$permissions = $xml_obj->module->permissions->permission; // /<  Acting permission
+			$menus = $xml_obj->module->menus->menu;
+			$actions = $xml_obj->module->actions->action; // /< Action list (required)
+
+			$default_index = $admin_index = '';
+
+			// Arrange permission information
+			if($grants)
+			{
+				if(is_array($grants)) $grant_list = $grants;
+				else $grant_list[] = $grants;
+
+				$info->grant = new stdClass();
+				$buff[] = '$info->grant = new stdClass;';
+				foreach($grant_list as $grant)
+				{
+					$name = $grant->attrs->name;
+					$default = $grant->attrs->default?$grant->attrs->default:'guest';
+					$title = $grant->title->body;
+
+					$info->grant->{$name} = new stdClass();
+					$info->grant->{$name}->title = $title;
+					$info->grant->{$name}->default = $default;
+
+					$buff[] = sprintf('$info->grant->%s = new stdClass;', $name);
+					$buff[] = sprintf('$info->grant->%s->title=\'%s\';', $name, $title);
+					$buff[] = sprintf('$info->grant->%s->default=\'%s\';', $name, $default);
+				}
+			}
+			// Permissions to grant
+			if($permissions)
+			{
+				if(is_array($permissions)) $permission_list = $permissions;
+				else $permission_list[] = $permissions;
+
+				$buff[] = '$info->permission = new stdClass;';
+
+				$info->permission = new stdClass();
+				foreach($permission_list as $permission)
+				{
+					$action = $permission->attrs->action;
+					$target = $permission->attrs->target;
+
+					$info->permission->{$action} = $target;
+
+					$buff[] = sprintf('$info->permission->%s = \'%s\';', $action, $target);
+				}
+			}
+			// for admin menus
+			if($menus)
+			{
+				if(is_array($menus)) $menu_list = $menus;
+				else $menu_list[] = $menus;
+
+				$buff[] = '$info->menu = new stdClass;';
+				$info->menu = new stdClass();
+				foreach($menu_list as $menu)
+				{
+					$menu_name = $menu->attrs->name;
+					$menu_title = is_array($menu->title) ? $menu->title[0]->body : $menu->title->body;
+					$menu_type = $menu->attrs->type;
+
+					$info->menu->{$menu_name} = new stdClass();
+					$info->menu->{$menu_name}->title = $menu_title;
+					$info->menu->{$menu_name}->acts = array();
+					$info->menu->{$menu_name}->type = $menu_type;
+
+					$buff[] = sprintf('$info->menu->%s = new stdClass;', $menu_name);
+					$buff[] = sprintf('$info->menu->%s->title=\'%s\';', $menu_name, $menu_title);
+					$buff[] = sprintf('$info->menu->%s->type=\'%s\';', $menu_name, $menu_type);
+				}
+			}
+
+			// actions
+			if($actions)
+			{
+				if(is_array($actions)) $action_list = $actions;
+				else $action_list[] = $actions;
+
+				$buff[] = '$info->action = new stdClass;';
+				$info->action = new stdClass();
+				foreach($action_list as $action)
+				{
+					$name = $action->attrs->name;
+
+					$type = $action->attrs->type;
+					$grant = $action->attrs->grant?$action->attrs->grant:'guest';
+					$standalone = $action->attrs->standalone=='false'?'false':'true';
+					$ruleset = $action->attrs->ruleset?$action->attrs->ruleset:'';
+					$method = $action->attrs->method?$action->attrs->method:'';
+
+					$index = $action->attrs->index;
+					$admin_index = $action->attrs->admin_index;
+					$setup_index = $action->attrs->setup_index;
+					$simple_setup_index = $action->attrs->simple_setup_index;
+					$menu_index = $action->attrs->menu_index;
+
+					$info->action->{$name} = new stdClass();
+					$info->action->{$name}->type = $type;
+					$info->action->{$name}->grant = $grant;
+					$info->action->{$name}->standalone = ($standalone == 'true') ? TRUE : FALSE;
+					$info->action->{$name}->ruleset = $ruleset;
+					$info->action->{$name}->method = $method;
+					if($action->attrs->menu_name)
+					{
+						if($menu_index == 'true')
+						{
+							$info->menu->{$action->attrs->menu_name}->index = $name;
+							$buff[] = sprintf('$info->menu->%s->index=\'%s\';', $action->attrs->menu_name, $name);
+						}
+						if(is_array($info->menu->{$action->attrs->menu_name}->acts))
+						{
+							$info->menu->{$action->attrs->menu_name}->acts[] = $name;
+							$currentKey = array_search($name, $info->menu->{$action->attrs->menu_name}->acts);
+						}
+
+						$buff[] = sprintf('$info->menu->%s->acts[%d]=\'%s\';', $action->attrs->menu_name, $currentKey, $name);
+						$i++;
+					}
+
+					$buff[] = sprintf('$info->action->%s = new stdClass;', $name);
+					$buff[] = sprintf('$info->action->%s->type=\'%s\';', $name, $type);
+					$buff[] = sprintf('$info->action->%s->grant=\'%s\';', $name, $grant);
+					$buff[] = sprintf('$info->action->%s->standalone=\'%s\';', $name, $standalone);
+					$buff[] = sprintf('$info->action->%s->ruleset=\'%s\';', $name, $ruleset);
+					$buff[] = sprintf('$info->action->%s->method=\'%s\';', $name, $method);
+
+					if($index=='true')
+					{
+						$default_index_act = $name;
+						$info->default_index_act = $name;
+					}
+					if($admin_index=='true')
+					{
+						$admin_index_act = $name;
+						$info->admin_index_act = $name;
+					}
+					if($setup_index=='true')
+					{
+						$setup_index_act = $name;
+						$info->setup_index_act = $name;
+					}
+					if($simple_setup_index=='true')
+					{
+						$simple_setup_index_act = $name;
+						$info->simple_setup_index_act = $name;
+					}
+				}
+			}
+			$buff['default_index_act'] = sprintf($buff['default_index_act'], $default_index_act);
+			$buff['setup_index_act'] = sprintf($buff['setup_index_act'], $setup_index_act);
+			$buff['simple_setup_index_act'] = sprintf($buff['simple_setup_index_act'], $simple_setup_index_act);
+			$buff['admin_index_act'] = sprintf($buff['admin_index_act'], $admin_index_act);
+
+			$buff[] = 'return $info;';
+
+			$buff = implode(PHP_EOL, $buff);
+
+			FileHandler::writeFile($cache_file, $buff);
+
 			return $info;
 		}
-		else
-		{
-			// Check if cached file exists
-			$cache_file = sprintf(_XE_PATH_ . "files/cache/module_info/%s.%s.%s.php", $module, Context::getLangType(), __XE_VERSION__);
 
-			// Update if no cache file exists or it is older than xml file
-			if($oCacheHandler->isSupport() || (!file_exists($cache_file) || filemtime($cache_file) < filemtime($xml_file) || $re_cache))
-			{
-				$info = new stdClass();
-				if(!$oCacheHandler->isSupport())
-				{
-					$buff = array(); // /< Set buff variable to use in the cache file
-					$buff[] = '<?php if(!defined("__XE__")) exit();';
-					$buff[] = '$info = new stdClass;';
-					$buff['default_index_act'] = '$info->default_index_act = \'%s\';';
-					$buff['setup_index_act'] = '$info->setup_index_act=\'%s\';';
-					$buff['simple_setup_index_act'] = '$info->simple_setup_index_act=\'%s\';';
-					$buff['admin_index_act'] = '$info->admin_index_act = \'%s\';';
-				}
-
-				$xml_obj = XmlParser::loadXmlFile($xml_file); // /< Read xml file and convert it to xml object
-
-				if(!count($xml_obj->module)) return; // /< Error occurs if module tag doesn't included in the xml
-
-				$grants = $xml_obj->module->grants->grant; // /< Permission information
-				$permissions = $xml_obj->module->permissions->permission; // /<  Acting permission
-				$menus = $xml_obj->module->menus->menu;
-				$actions = $xml_obj->module->actions->action; // /< Action list (required)
-
-				$default_index = $admin_index = '';
-
-				// Arrange permission information
-				if($grants)
-				{
-					if(is_array($grants)) $grant_list = $grants;
-					else $grant_list[] = $grants;
-
-					$info->grant = new stdClass();
-					if(!$oCacheHandler->isSupport())
-					{
-						$buff[] = '$info->grant = new stdClass;';
-					}
-					foreach($grant_list as $grant)
-					{
-						$name = $grant->attrs->name;
-						$default = $grant->attrs->default?$grant->attrs->default:'guest';
-						$title = $grant->title->body;
-
-						$info->grant->{$name} = new stdClass();
-						$info->grant->{$name}->title = $title;
-						$info->grant->{$name}->default = $default;
-
-						if(!$oCacheHandler->isSupport())
-						{
-							$buff[] = sprintf('$info->grant->%s = new stdClass;', $name);
-							$buff[] = sprintf('$info->grant->%s->title=\'%s\';', $name, $title);
-							$buff[] = sprintf('$info->grant->%s->default=\'%s\';', $name, $default);
-						}
-					}
-				}
-				// Permissions to grant
-				if($permissions)
-				{
-					if(is_array($permissions)) $permission_list = $permissions;
-					else $permission_list[] = $permissions;
-
-					$buff[] = '$info->permission = new stdClass;';
-
-					$info->permission = new stdClass();
-					foreach($permission_list as $permission)
-					{
-						$action = $permission->attrs->action;
-						$target = $permission->attrs->target;
-
-						$info->permission->{$action} = $target;
-
-						if(!$oCacheHandler->isSupport())
-						{
-							$buff[] = sprintf('$info->permission->%s = \'%s\';', $action, $target);
-						}
-					}
-				}
-				// for admin menus
-				if($menus)
-				{
-					if(is_array($menus)) $menu_list = $menus;
-					else $menu_list[] = $menus;
-
-					if(!$oCacheHandler->isSupport())
-					{
-						$buff[] = '$info->menu = new stdClass;';
-					}
-					$info->menu = new stdClass();
-					foreach($menu_list as $menu)
-					{
-						$menu_name = $menu->attrs->name;
-						$menu_title = is_array($menu->title) ? $menu->title[0]->body : $menu->title->body;
-						$menu_type = $menu->attrs->type;
-
-						$info->menu->{$menu_name} = new stdClass();
-						$info->menu->{$menu_name}->title = $menu_title;
-						$info->menu->{$menu_name}->acts = array();
-						$info->menu->{$menu_name}->type = $menu_type;
-
-						if(!$oCacheHandler->isSupport())
-						{
-							$buff[] = sprintf('$info->menu->%s = new stdClass;', $menu_name);
-							$buff[] = sprintf('$info->menu->%s->title=\'%s\';', $menu_name, $menu_title);
-							$buff[] = sprintf('$info->menu->%s->type=\'%s\';', $menu_name, $menu_type);
-						}
-					}
-				}
-
-				// actions
-				if($actions)
-				{
-					if(is_array($actions)) $action_list = $actions;
-					else $action_list[] = $actions;
-
-					if(!$oCacheHandler->isSupport())
-					{
-						$buff[] = '$info->action = new stdClass;';
-					}
-					$info->action = new stdClass();
-					foreach($action_list as $action)
-					{
-						$name = $action->attrs->name;
-
-						$type = $action->attrs->type;
-						$grant = $action->attrs->grant?$action->attrs->grant:'guest';
-						$standalone = $action->attrs->standalone=='false'?'false':'true';
-						$ruleset = $action->attrs->ruleset?$action->attrs->ruleset:'';
-						$method = $action->attrs->method?$action->attrs->method:'';
-
-						$index = $action->attrs->index;
-						$admin_index = $action->attrs->admin_index;
-						$setup_index = $action->attrs->setup_index;
-						$simple_setup_index = $action->attrs->simple_setup_index;
-						$menu_index = $action->attrs->menu_index;
-
-						$info->action->{$name} = new stdClass();
-						$info->action->{$name}->type = $type;
-						$info->action->{$name}->grant = $grant;
-						$info->action->{$name}->standalone = ($standalone == 'true') ? TRUE : FALSE;
-						$info->action->{$name}->ruleset = $ruleset;
-						$info->action->{$name}->method = $method;
-						if($action->attrs->menu_name)
-						{
-							if($menu_index == 'true')
-							{
-								$info->menu->{$action->attrs->menu_name}->index = $name;
-								if(!$oCacheHandler->isSupport())
-								{
-									$buff[] = sprintf('$info->menu->%s->index=\'%s\';', $action->attrs->menu_name, $name);
-								}
-							}
-							if(is_array($info->menu->{$action->attrs->menu_name}->acts))
-							{
-								$info->menu->{$action->attrs->menu_name}->acts[] = $name;
-								$currentKey = array_search($name, $info->menu->{$action->attrs->menu_name}->acts);
-							}
-
-							if(!$oCacheHandler->isSupport())
-							{
-								$buff[] = sprintf('$info->menu->%s->acts[%d]=\'%s\';', $action->attrs->menu_name, $currentKey, $name);
-							}
-							$i++;
-						}
-
-						if(!$oCacheHandler->isSupport())
-						{
-							$buff[] = sprintf('$info->action->%s = new stdClass;', $name);
-							$buff[] = sprintf('$info->action->%s->type=\'%s\';', $name, $type);
-							$buff[] = sprintf('$info->action->%s->grant=\'%s\';', $name, $grant);
-							$buff[] = sprintf('$info->action->%s->standalone=\'%s\';', $name, $standalone);
-							$buff[] = sprintf('$info->action->%s->ruleset=\'%s\';', $name, $ruleset);
-							$buff[] = sprintf('$info->action->%s->method=\'%s\';', $name, $method);
-						}
-
-						if($index=='true')
-						{
-							$default_index_act = $name;
-							$info->default_index_act = $name;
-						}
-						if($admin_index=='true')
-						{
-							$admin_index_act = $name;
-							$info->admin_index_act = $name;
-						}
-						if($setup_index=='true')
-						{
-							$setup_index_act = $name;
-							$info->setup_index_act = $name;
-						}
-						if($simple_setup_index=='true')
-						{
-							$simple_setup_index_act = $name;
-							$info->simple_setup_index_act = $name;
-						}
-					}
-				}
-				if(!$oCacheHandler->isSupport())
-				{
-					$buff['default_index_act'] = sprintf($buff['default_index_act'], $default_index_act);
-					$buff['setup_index_act'] = sprintf($buff['setup_index_act'], $setup_index_act);
-					$buff['simple_setup_index_act'] = sprintf($buff['simple_setup_index_act'], $simple_setup_index_act);
-					$buff['admin_index_act'] = sprintf($buff['admin_index_act'], $admin_index_act);
-
-					$buff[] = 'return $info;';
-				}
-
-				if($oCacheHandler->isSupport())
-				{
-					$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
-					$oCacheHandler->put($cache_key, $info);
-				}
-				else
-				{
-					$buff = implode(PHP_EOL, $buff);
-
-					FileHandler::writeFile($cache_file, $buff);
-				}
-
-				return $info;
-			}
-
-			if(!$oCacheHandler->isSupport() && file_exists($cache_file))
-			{
-				return include($cache_file);
-			}
-		}
+		if(file_exists($cache_file)) return include($cache_file);
 	}
 
 	/**

From fed1bf425c2c462b7a7a0d0691fcea88b38e40fa Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Thu, 8 May 2014 10:29:34 +0900
Subject: [PATCH 31/44] =?UTF-8?q?Revert=20"=EC=9C=84=EC=A0=AF=20=EC=BA=90?=
 =?UTF-8?q?=EC=8B=B1=20=EC=84=A4=EC=A0=95=20=EC=8B=9C=20memcache=EB=82=98?=
 =?UTF-8?q?=20apc=EC=97=90=20=EC=A0=80=EC=9E=A5=ED=95=A0=20=EC=88=98=20?=
 =?UTF-8?q?=EC=9E=88=EB=8F=84=EB=A1=9D=20=EA=B0=9C=EC=84=A0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 127fca81e006432d763a1c3674c18a8ab0a963c2.
---
 modules/widget/widget.controller.php | 71 ++++++++++------------------
 1 file changed, 24 insertions(+), 47 deletions(-)

diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index 613ea39d3..8c6587b9d 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -374,58 +374,35 @@ class widgetController extends widget
 			return $widget_content;
 		}
 
-		$oCacheHandler = CacheHandler::getInstance('template');
-		if($oCacheHandler->isSupport())
+		/**
+		 * Cache number and cache values are set so that the cache file should call
+		 */
+		FileHandler::makeDir($this->cache_path);
+		// Wanted cache file
+		$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $widget_sequence, $lang_type);
+		// If the file exists in the cache, the file validation
+		if(!$ignore_cache && file_exists($cache_file))
 		{
-			$key = 'widget_cache:' . $widget_sequence;
-
-			$cache_body = $oCacheHandler->get($key);
-			$cache_body = preg_replace('@<\!--#Meta:@', '<!--Meta:', $cache_body);
-		}
-
-		if($cache_body)
-		{
-			return $cache_body;
-		}
-		else
-		{
-			/**
-			 * Cache number and cache values are set so that the cache file should call
-			 */
-			FileHandler::makeDir($this->cache_path);
-			// Wanted cache file
-			$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $widget_sequence, $lang_type);
-			// If the file exists in the cache, the file validation
-			if(!$ignore_cache && file_exists($cache_file))
+			$filemtime = filemtime($cache_file);
+			// Should be modified compared to the time of the cache or in the future if creating more than widget.controller.php file a return value of the cache
+			if($filemtime + $widget_cache * 60 > $_SERVER['REQUEST_TIME'] && $filemtime > filemtime(_XE_PATH_.'modules/widget/widget.controller.php'))
 			{
-				$filemtime = filemtime($cache_file);
-				// Should be modified compared to the time of the cache or in the future if creating more than widget.controller.php file a return value of the cache
-				if($filemtime + $widget_cache * 60 > $_SERVER['REQUEST_TIME'] && $filemtime > filemtime(_XE_PATH_.'modules/widget/widget.controller.php'))
-				{
-					$cache_body = FileHandler::readFile($cache_file);
-					$cache_body = preg_replace('@<\!--#Meta:@', '<!--Meta:', $cache_body);
+				$cache_body = FileHandler::readFile($cache_file);
+				$cache_body = preg_replace('@<\!--#Meta:@', '<!--Meta:', $cache_body);
 
-					return $cache_body;
-				}
-			}
-			// cache update and cache renewal of the file mtime
-			touch($cache_file);
-
-			$oWidget = $this->getWidgetObject($widget);
-			if(!$oWidget || !method_exists($oWidget,'proc')) return;
-
-			$widget_content = $oWidget->proc($args);
-			$oModuleController = getController('module');
-			$oModuleController->replaceDefinedLangCode($widget_content);
-			if($oCacheHandler->isSupport())
-			{
-				$oCacheHandler->put($key, $widget_content, $widget_cache * 60);
-			}
-			else
-			{
-				FileHandler::writeFile($cache_file, $widget_content);
+				return $cache_body;
 			}
 		}
+		// cache update and cache renewal of the file mtime
+		touch($cache_file);
+
+		$oWidget = $this->getWidgetObject($widget);
+		if(!$oWidget || !method_exists($oWidget,'proc')) return;
+
+		$widget_content = $oWidget->proc($args);
+		$oModuleController = getController('module');
+		$oModuleController->replaceDefinedLangCode($widget_content);
+		FileHandler::writeFile($cache_file, $widget_content);
 
 		return $widget_content;
 	}

From bdc1f585eb196e526b291aad85e663945c3bffcf Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Thu, 8 May 2014 11:30:26 +0900
Subject: [PATCH 32/44] =?UTF-8?q?#652=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=EC=8B=9C=20ie=20=EB=B8=8C=EB=9D=BC=EC=9A=B0?=
 =?UTF-8?q?=EC=A0=B8=EC=97=90=EC=84=9C=20jquery=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=B2=98=EB=A6=AC,=20jquery=202.x=20ie=20?=
 =?UTF-8?q?=EC=A7=80=EC=9B=90=20=EB=AC=B8=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/editor/components/image_link/tpl/popup.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/editor/components/image_link/tpl/popup.js b/modules/editor/components/image_link/tpl/popup.js
index 7de60338c..58b13b6cc 100644
--- a/modules/editor/components/image_link/tpl/popup.js
+++ b/modules/editor/components/image_link/tpl/popup.js
@@ -24,8 +24,8 @@
         var align = (node.style.cssFloat) ? node.style.cssFloat : node.style.styleFloat;
         var margin = (node.style.margin) ? node.style.margin.match('[0-9]+') : node.getAttribute('margin');
         var alt = node.getAttribute('alt');
-        var width = $(node).width();
-        var height = $(node).height();
+		var width = node.getAttribute('width');
+		var height = node.getAttribute('height');
         var link_url = node.getAttribute('link_url');
         var open_window = node.getAttribute('open_window');
 

From a93df3970e411a5bc1a7c0a994c553768e073239 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Thu, 8 May 2014 11:59:59 +0900
Subject: [PATCH 33/44] =?UTF-8?q?fix=20beta-issue=20#648=20=EC=9C=84?=
 =?UTF-8?q?=EC=A0=AF=20=EB=B0=95=EC=8A=A4=20border,=20background-color=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=8B=9C=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/widget/tpl/js/widget.js      | 20 ++++++++++++--------
 modules/widget/tpl/widget_layer.html | 10 +++++-----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js
index 212893f9c..ae0296545 100644
--- a/modules/widget/tpl/js/widget.js
+++ b/modules/widget/tpl/js/widget.js
@@ -664,16 +664,20 @@ function doShowWidgetSizeSetup(px, py, obj) {
 
 	jQuery.each(opts, function(key, val){
 		var el = form[0].elements[key];
-		if (el)
-		{
-			el.value = val;
-			if(el.className.match(/\bcolor-indicator\b/))
-			{
-				el.style.background = el.value = '#'+el.value;
+		var $el = jQuery(el);
+		if(el) {
+			$el.val(val);
+
+			if($el.hasClass('color-indicator')) {
+				if(val != 'transparent') {
+					val = val.toUpperCase();
+					$el.css('background', '#' + val);
+					$el.val('#' + val);
+				}
 			}
 		}
-		if (el.tagName.toLowerCase() == "select")
-		{
+
+		if(el.tagName.toLowerCase() == "select") {
 			if(el.selectedIndex == -1) {
 				el.selectedIndex = 0;
 			}
diff --git a/modules/widget/tpl/widget_layer.html b/modules/widget/tpl/widget_layer.html
index 9afbdd1be..71c869df4 100644
--- a/modules/widget/tpl/widget_layer.html
+++ b/modules/widget/tpl/widget_layer.html
@@ -62,7 +62,7 @@
 							<option value="solid">{$lang->cmd_widget_border_solid}</option>
 							<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
 						</select>
-						<input type="text" name="border_top_color" value="" class="color_input color-indicator" maxlength="6"/>
+						<input type="text" name="border_top_color" value="" class="color_input color-indicator" maxlength="7"/>
 					</td>
 				</tr>
 				<tr>
@@ -72,7 +72,7 @@
 							<option value="solid">{$lang->cmd_widget_border_solid}</option>
 							<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
 						</select>
-						<input type="text" name="border_left_color" value="" class="color_input color-indicator" maxlength="6"/>
+						<input type="text" name="border_left_color" value="" class="color_input color-indicator" maxlength="7"/>
 					</td>
 					<td style="text-align:right">
 						<input type="number" name="border_right_thick" value="" class="small_input" /> px
@@ -80,7 +80,7 @@
 							<option value="solid">{$lang->cmd_widget_border_solid}</option>
 							<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
 						</select>
-						<input type="text" name="border_right_color" value="" class="color_input color-indicator" maxlength="6"/>
+						<input type="text" name="border_right_color" value="" class="color_input color-indicator" maxlength="7"/>
 					</td>
 				</tr>
 				<tr>
@@ -90,7 +90,7 @@
 							<option value="solid">{$lang->cmd_widget_border_solid}</option>
 							<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
 						</select>
-						<input type="text" name="border_bottom_color" value="" class="color_input color-indicator" maxlength="6"/>
+						<input type="text" name="border_bottom_color" value="" class="color_input color-indicator" maxlength="7"/>
 					</td>
 				</tr>
 				<tr>
@@ -126,7 +126,7 @@
 	<style scoped>
 	.wgs{margin:0;width:700px}
 	.wgs select{margin:0;width:auto}
-	.wgs input{margin:0!important;width:50px}
+	.wgs input{margin:0!important;width:60px}
 	</style>
 </section>
 <!--%load_js_plugin("ui.colorpicker")-->

From e3af3a1f38f73ba43117776b3d54bf57a1374f95 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Thu, 8 May 2014 12:04:22 +0900
Subject: [PATCH 34/44] MINIFY

---
 common/js/x.min.js                    | 2 +-
 modules/admin/tpl/js/admin.min.js     | 2 +-
 modules/editor/tpl/js/uploader.min.js | 2 +-
 modules/widget/tpl/js/widget.min.js   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/js/x.min.js b/common/js/x.min.js
index f66ae0fa5..3e0318771 100644
--- a/common/js/x.min.js
+++ b/common/js/x.min.js
@@ -1 +1 @@
-function xDeprecate(a){var b="DEPRECATED : "+a+"() is deprecated function.";"object"==typeof console&&"function"==typeof console.log&&console.log(b)}function xAddEventListener(e,eT,eL,cap){if(xDeprecate("xAddEventListener"),e=xGetElementById(e)){if(eT=eT.toLowerCase(),!xIE4Up&&!xOp7Up&&e==window){if("resize"==eT)return window.xPCW=xClientWidth(),window.xPCH=xClientHeight(),window.xREL=eL,void xResizeEvent();if("scroll"==eT)return window.xPSL=xScrollLeft(),window.xPST=xScrollTop(),window.xSEL=eL,void xScrollEvent()}var eh="e.on"+eT+"=eL";e.addEventListener?e.addEventListener(eT,eL,cap):e.attachEvent?e.attachEvent("on"+eT,eL):eval(eh)}}function xResizeEvent(){xDeprecate("xResizeEvent"),window.xREL&&setTimeout("xResizeEvent()",250);var a=xClientWidth(),b=xClientHeight();(window.xPCW!=a||window.xPCH!=b)&&(window.xPCW=a,window.xPCH=b,window.xREL&&window.xREL())}function xScrollEvent(){xDeprecate("xScrollEvent"),window.xSEL&&setTimeout("xScrollEvent()",250);var a=xScrollLeft(),b=xScrollTop();(window.xPSL!=a||window.xPST!=b)&&(window.xPSL=a,window.xPST=b,window.xSEL&&window.xSEL())}function xAppendChild(a,b){return xDeprecate("xAppendChild"),a.appendChild?a.appendChild(b):null}function xClientHeight(){xDeprecate("xClientHeight");var a=0;return xOp6Dn?a=window.innerHeight:"CSS1Compat"==document.compatMode&&!window.opera&&document.documentElement&&document.documentElement.clientHeight?a=document.documentElement.clientHeight:document.body&&document.body.clientHeight?a=document.body.clientHeight:xDef(window.innerWidth,window.innerHeight,document.width)&&(a=window.innerHeight,document.width>window.innerWidth&&(a-=16)),a}function xClientWidth(){xDeprecate("xClientWidth");var a=0;return xOp6Dn?a=window.innerWidth:"CSS1Compat"==document.compatMode&&!window.opera&&document.documentElement&&document.documentElement.clientWidth?a=document.documentElement.clientWidth:document.body&&document.body.clientWidth?a=document.body.clientWidth:xDef(window.innerWidth,window.innerHeight,document.height)&&(a=window.innerWidth,document.height>window.innerHeight&&(a-=16)),a}function xCreateElement(a){return xDeprecate("xCreateElement"),document.createElement?document.createElement(a):null}function xDef(){xDeprecate("xDef");for(var a=0;a<arguments.length;++a)if("undefined"==typeof arguments[a])return!1;return!0}function xDeleteCookie(a,b){xDeprecate("xDeleteCookie"),xGetCookie(a)&&(document.cookie=a+"=; path="+(b?b:"/")+"; expires="+new Date(0).toGMTString())}function xDisplay(a,b){return xDeprecate("xDisplay"),(a=xGetElementById(a))?a.style&&xDef(a.style.display)?(xStr(b)&&(a.style.display=b),a.style.display):null:null}function xEvent(a){xDeprecate("xEvent");var b=a||window.event;b&&(b.type&&(this.type=b.type),b.target?this.target=b.target:b.srcElement&&(this.target=b.srcElement),b.relatedTarget?this.relatedTarget=b.relatedTarget:"mouseover"==b.type&&b.fromElement?this.relatedTarget=b.fromElement:"mouseout"==b.type&&(this.relatedTarget=b.toElement),xOp6Dn?(this.pageX=b.clientX,this.pageY=b.clientY):xDef(b.pageX,b.pageY)?(this.pageX=b.pageX,this.pageY=b.pageY):xDef(b.clientX,b.clientY)&&(this.pageX=b.clientX+xScrollLeft(),this.pageY=b.clientY+xScrollTop()),xDef(b.offsetX,b.offsetY)?(this.offsetX=b.offsetX,this.offsetY=b.offsetY):xDef(b.layerX,b.layerY)?(this.offsetX=b.layerX,this.offsetY=b.layerY):(this.offsetX=this.pageX-xPageX(this.target),this.offsetY=this.pageY-xPageY(this.target)),b.keyCode?this.keyCode=b.keyCode:xDef(b.which)&&-1!=b.type.indexOf("key")&&(this.keyCode=b.which),this.shiftKey=b.shiftKey,this.ctrlKey=b.ctrlKey,this.altKey=b.altKey)}function xFirstChild(a,b){xDeprecate("xFirstChild");var c=a?a.firstChild:null;if(b)for(;c&&c.nodeName!=b;)c=c.nextSibling;else for(;c&&1!=c.nodeType;)c=c.nextSibling;return c}function xGetBodyWidth(){xDeprecate("xGetBodyWidth");var a=xClientWidth(),b=window.document.body.scrollWidth;return a>b?a:b}function xGetBodyHeight(){xDeprecate("xGetBodyHeight");var a=xClientHeight(),b=window.document.body.scrollHeight;return a>b?a:b}function xGetComputedStyle(a,b,d){xDeprecate("xGetComputedStyle");var e,f="undefined",g=document.defaultView;if(g&&g.getComputedStyle)e=g.getComputedStyle(a,""),e&&(f=e.getPropertyValue(b));else{if(!a.currentStyle)return null;var h=b.split("-");b=h[0];for(var i=1;i<h.length;++i)c=h[i].charAt(0),b+=h[i].replace(c,c.toUpperCase());f=a.currentStyle[b]}return d?parseInt(f)||0:f}function xGetCookie(a){xDeprecate("xGetCookie");var b=null,c=a+"=";if(document.cookie.length>0){var d=document.cookie.indexOf(c);if(-1!=d){d+=c.length;var e=document.cookie.indexOf(";",d);-1==e&&(e=document.cookie.length),b=unescape(document.cookie.substring(d,e))}}return b}function xGetElementById(a){return xDeprecate("xGetElementById"),"string"!=typeof a?a:a=document.getElementById?document.getElementById(a):document.all?document.all[a]:null}function xGetElementsByAttribute(a,b,c,d){xDeprecate("xGetElementsByAttribute");var e,f,g=new Array,h=new RegExp(c,"i");f=xGetElementsByTagName(a);for(var i=0;i<f.length;++i)e=f[i].getAttribute(b),e||(e=f[i][b]),"string"==typeof e&&-1!=e.search(h)&&(g[g.length]=f[i],d&&d(f[i]));return g}function xGetElementsByClassName(a,b,c,d){xDeprecate("xGetElementsByClassName");for(var e=new Array,f=new RegExp("\\b"+a+"\\b","i"),g=xGetElementsByTagName(c,b),h=0;h<g.length;++h)g[h].className&&-1!=g[h].className.search(f)&&(e[e.length]=g[h],d&&d(g[h]));return e}function xGetElementsByTagName(a,b){xDeprecate("xGetElementsByTagName");var c=null;return a=a||"*",b=b||document,xIE4||xIE5?c="*"==a?b.all:b.all.tags(a):b.getElementsByTagName&&(c=b.getElementsByTagName(a)),c||new Array}function xGetURLArguments(){xDeprecate("xGetURLArguments");var a=location.href.indexOf("?"),b=new Array;if(-1!=a)for(var c=location.href.substring(a+1,location.href.length).split("&"),d=0;d<c.length;d++)nameVal=c[d].split("="),b[d]=nameVal[1],b[nameVal[0]]=nameVal[1];return b}function xHeight(a,b){if(xDeprecate("xHeight"),!(a=xGetElementById(a)))return 0;b=xNum(b)?0>b?0:Math.round(b):-1;var c=xDef(a.style);if(a==document||"html"==a.tagName.toLowerCase()||"body"==a.tagName.toLowerCase())b=xClientHeight();else if(c&&xDef(a.offsetHeight)&&xStr(a.style.height)){if(b>=0){var d=0,e=0,f=0,g=0;if("CSS1Compat"==document.compatMode){var h=xGetComputedStyle;d=h(a,"padding-top",1),null!==d?(e=h(a,"padding-bottom",1),f=h(a,"border-top-width",1),g=h(a,"border-bottom-width",1)):xDef(a.offsetHeight,a.style.height)&&(a.style.height=b+"px",d=a.offsetHeight-b)}if(b-=d+e+f+g,isNaN(b)||0>b)return null;a.style.height=b+"px"}b=a.offsetHeight}else c&&xDef(a.style.pixelHeight)&&(b>=0&&(a.style.pixelHeight=b),b=a.style.pixelHeight);return b}function xHex(a,b,c){xDeprecate("xHex");var d="",e=Math.ceil(a);c&&(d=c),e=e.toString(16);for(var f=0;f<b-e.length;++f)d+="0";return d+e}function xHide(a){return xDeprecate("xHide"),xVisibility(a,0)}function xInnerHtml(a,b){if(xDeprecate("xInnerHtml"),!(a=xGetElementById(a))||!xStr(a.innerHTML))return null;var c=a.innerHTML;return xStr(b)&&(a.innerHTML=b),c}function xLeft(a,b){if(xDeprecate("xLeft"),!(a=xGetElementById(a)))return 0;var c=xDef(a.style);return c&&xStr(a.style.left)?xNum(b)?a.style.left=b+"px":(b=parseInt(a.style.left),isNaN(b)&&(b=0)):c&&xDef(a.style.pixelLeft)&&(xNum(b)?a.style.pixelLeft=b:b=a.style.pixelLeft),b}function xMoveTo(a,b,c){xDeprecate("xMoveTo"),xLeft(a,b),xTop(a,c)}function xName(a){return xDeprecate("xName"),a?a.id&&""!=a.id?a.id:a.name&&""!=a.name?a.name:a.nodeName&&""!=a.nodeName?a.nodeName:a.tagName&&""!=a.tagName?a.tagName:a:a}function xNextSib(a,b){xDeprecate("xNextSib");var c=a?a.nextSibling:null;if(b)for(;c&&c.nodeName!=b;)c=c.nextSibling;else for(;c&&1!=c.nodeType;)c=c.nextSibling;return c}function xNum(){xDeprecate("xNum");for(var a=0;a<arguments.length;++a)if(isNaN(arguments[a])||"number"!=typeof arguments[a])return!1;return!0}function xOffsetLeft(a){return xDeprecate("xOffsetLeft"),(a=xGetElementById(a))?xDef(a.offsetLeft)?a.offsetLeft:0:0}function xOffsetTop(a){return xDeprecate("xOffsetTop"),(a=xGetElementById(a))?xDef(a.offsetTop)?a.offsetTop:0:0}function xPad(a,b,c,d){if(xDeprecate("xPad"),"string"!=typeof a&&(a+=""),d)for(var e=a.length;b>e;++e)a=c+a;else for(e=a.length;b>e;++e)a+=c;return a}function xPageX(a){if(xDeprecate("xPageX"),!(a=xGetElementById(a)))return 0;for(var b=0;a;)xDef(a.offsetLeft)&&(b+=a.offsetLeft),a=xDef(a.offsetParent)?a.offsetParent:null;return b}function xPageY(a){if(xDeprecate("xPageY"),!(a=xGetElementById(a)))return 0;for(var b=0;a;)xDef(a.offsetTop)&&(b+=a.offsetTop),a=xDef(a.offsetParent)?a.offsetParent:null;return b}function xParent(a,b){if(xDeprecate("xParent"),!(a=xGetElementById(a)))return null;var c=null;return!b&&xDef(a.offsetParent)?c=a.offsetParent:xDef(a.parentNode)?c=a.parentNode:xDef(a.parentElement)&&(c=a.parentElement),c}function xPreventDefault(a){xDeprecate("xPreventDefault"),a&&a.preventDefault?a.preventDefault():window.event&&(window.event.returnValue=!1)}function xPrevSib(a,b){xDeprecate("xPrevSib");var c=a?a.previousSibling:null;if(b)for(;c&&c.nodeName!=b;)c=c.previousSibling;else for(;c&&1!=c.nodeType;)c=c.previousSibling;return c}function xRemoveEventListener(e,eT,eL,cap){if(xDeprecate("xRemoveEventListener"),e=xGetElementById(e)){if(eT=eT.toLowerCase(),!xIE4Up&&!xOp7Up&&e==window){if("resize"==eT)return void(window.xREL=null);if("scroll"==eT)return void(window.xSEL=null)}var eh="e.on"+eT+"=null";e.removeEventListener?e.removeEventListener(eT,eL,cap):e.detachEvent?e.detachEvent("on"+eT,eL):eval(eh)}}function xResizeTo(a,b,c){xDeprecate("xResizeTo"),xWidth(a,b),xHeight(a,c)}function xScrollLeft(a,b){xDeprecate("xScrollLeft");var c=0;if(!xDef(a)||b||a==document||"html"==a.tagName.toLowerCase()||"body"==a.tagName.toLowerCase()){var d=window;b&&a&&(d=a),d.document.documentElement&&d.document.documentElement.scrollLeft?c=d.document.documentElement.scrollLeft:d.document.body&&xDef(d.document.body.scrollLeft)&&(c=d.document.body.scrollLeft)}else a=xGetElementById(a),a&&xNum(a.scrollLeft)&&(c=a.scrollLeft);return c}function xScrollTop(a,b){xDeprecate("xScrollTop");var c=0;if(!xDef(a)||b||a==document||"html"==a.tagName.toLowerCase()||"body"==a.tagName.toLowerCase()){var d=window;b&&a&&(d=a),d.document.documentElement&&d.document.documentElement.scrollTop?c=d.document.documentElement.scrollTop:d.document.body&&xDef(d.document.body.scrollTop)&&(c=d.document.body.scrollTop)}else a=xGetElementById(a),a&&xNum(a.scrollTop)&&(c=a.scrollTop);return c}function xSetCookie(a,b,c,d){xDeprecate("xSetCookie"),document.cookie=a+"="+escape(b)+(c?"; expires="+c.toGMTString():"")+"; path="+(d?d:"/")}function xShow(a){return xDeprecate("xShow"),xVisibility(a,1)}function xStr(){xDeprecate("xStr");for(var a=0;a<arguments.length;++a)if("string"!=typeof arguments[a])return!1;return!0}function xTop(a,b){if(xDeprecate("xTop"),!(a=xGetElementById(a)))return 0;var c=xDef(a.style);return c&&xStr(a.style.top)?xNum(b)?a.style.top=b+"px":(b=parseInt(a.style.top),isNaN(b)&&(b=0)):c&&xDef(a.style.pixelTop)&&(xNum(b)?a.style.pixelTop=b:b=a.style.pixelTop),b}function xVisibility(a,b){return xDeprecate("xVisibility"),(a=xGetElementById(a))?a.style&&xDef(a.style.visibility)?(xDef(b)&&(a.style.visibility=b?"visible":"hidden"),a.style.visibility):null:null}function xWidth(a,b){if(xDeprecate("xWidth"),!(a=xGetElementById(a)))return 0;b=xNum(b)?0>b?0:Math.round(b):-1;var c=xDef(a.style);if(a==document||"html"==a.tagName.toLowerCase()||"body"==a.tagName.toLowerCase())b=xClientWidth();else if(c&&xDef(a.offsetWidth)&&xStr(a.style.width)){if(b>=0){var d=0,e=0,f=0,g=0;if("CSS1Compat"==document.compatMode){var h=xGetComputedStyle;d=h(a,"padding-left",1),null!==d?(e=h(a,"padding-right",1),f=h(a,"border-left-width",1),g=h(a,"border-right-width",1)):xDef(a.offsetWidth,a.style.width)&&(a.style.width=b+"px",d=a.offsetWidth-b)}if(b-=d+e+f+g,isNaN(b)||0>b)return null;a.style.width=b+"px"}b=a.offsetWidth}else c&&xDef(a.style.pixelWidth)&&(b>=0&&(a.style.pixelWidth=b),b=a.style.pixelWidth);return b}function xZIndex(a,b){return xDeprecate("xZIndex"),(a=xGetElementById(a))?(a.style&&xDef(a.style.zIndex)&&(xNum(b)&&(a.style.zIndex=b),b=parseInt(a.style.zIndex)),b):0}function xStopPropagation(a){xDeprecate("xStopPropagation"),a&&a.stopPropagation?a.stopPropagation():window.event&&(window.event.cancelBubble=!0)}var xOp7Up,xOp6Dn,xIE4Up,xIE4,xIE5,xIE6,xNN4,xUA=navigator.userAgent.toLowerCase();if(window.opera){var i=xUA.indexOf("opera");if(-1!=i){var v=parseInt(xUA.charAt(i+6));xOp7Up=v>=7,xOp6Dn=7>v}}else"KDE"!=navigator.vendor&&document.all&&-1!=xUA.indexOf("msie")?(xIE4Up=parseFloat(navigator.appVersion)>=4,xIE4=-1!=xUA.indexOf("msie 4"),xIE5=-1!=xUA.indexOf("msie 5"),xIE6=-1!=xUA.indexOf("msie 6")):document.layers&&(xNN4=!0);var xMac=-1!=xUA.indexOf("mac"),xFF=-1!=xUA.indexOf("firefox");
\ No newline at end of file
+function xDeprecate(a){var b="DEPRECATED : "+a+"() is deprecated function.";"object"==typeof console&&"function"==typeof console.log&&console.log(b)}function xAddEventListener(e,eT,eL,cap){if(xDeprecate("xAddEventListener"),e=xGetElementById(e)){if(eT=eT.toLowerCase(),!xIE4Up&&!xOp7Up&&e==window){if("resize"==eT)return window.xPCW=xClientWidth(),window.xPCH=xClientHeight(),window.xREL=eL,void xResizeEvent();if("scroll"==eT)return window.xPSL=xScrollLeft(),window.xPST=xScrollTop(),window.xSEL=eL,void xScrollEvent()}var eh="e.on"+eT+"=eL";e.addEventListener?e.addEventListener(eT,eL,cap):e.attachEvent?e.attachEvent("on"+eT,eL):eval(eh)}}function xResizeEvent(){xDeprecate("xResizeEvent"),window.xREL&&setTimeout("xResizeEvent()",250);var a=xClientWidth(),b=xClientHeight();(window.xPCW!=a||window.xPCH!=b)&&(window.xPCW=a,window.xPCH=b,window.xREL&&window.xREL())}function xScrollEvent(){xDeprecate("xScrollEvent"),window.xSEL&&setTimeout("xScrollEvent()",250);var a=xScrollLeft(),b=xScrollTop();(window.xPSL!=a||window.xPST!=b)&&(window.xPSL=a,window.xPST=b,window.xSEL&&window.xSEL())}function xAppendChild(a,b){return xDeprecate("xAppendChild"),a.appendChild?a.appendChild(b):null}function xClientHeight(){xDeprecate("xClientHeight");var a=0;return xOp6Dn?a=window.innerHeight:"CSS1Compat"==document.compatMode&&!window.opera&&document.documentElement&&document.documentElement.clientHeight?a=document.documentElement.clientHeight:document.body&&document.body.clientHeight?a=document.body.clientHeight:xDef(window.innerWidth,window.innerHeight,document.width)&&(a=window.innerHeight,document.width>window.innerWidth&&(a-=16)),a}function xClientWidth(){xDeprecate("xClientWidth");var a=0;return xOp6Dn?a=window.innerWidth:"CSS1Compat"==document.compatMode&&!window.opera&&document.documentElement&&document.documentElement.clientWidth?a=document.documentElement.clientWidth:document.body&&document.body.clientWidth?a=document.body.clientWidth:xDef(window.innerWidth,window.innerHeight,document.height)&&(a=window.innerWidth,document.height>window.innerHeight&&(a-=16)),a}function xCreateElement(a){return xDeprecate("xCreateElement"),document.createElement?document.createElement(a):null}function xDef(){xDeprecate("xDef");for(var a=0;a<arguments.length;++a)if("undefined"==typeof arguments[a])return!1;return!0}function xDeleteCookie(a,b){xDeprecate("xDeleteCookie"),xGetCookie(a)&&(document.cookie=a+"=; path="+(b?b:"/")+"; expires="+new Date(0).toGMTString())}function xDisplay(a,b){return xDeprecate("xDisplay"),(a=xGetElementById(a))&&a.style&&xDef(a.style.display)?(xStr(b)&&(a.style.display=b),a.style.display):null}function xEvent(a){xDeprecate("xEvent");var b=a||window.event;b&&(b.type&&(this.type=b.type),b.target?this.target=b.target:b.srcElement&&(this.target=b.srcElement),b.relatedTarget?this.relatedTarget=b.relatedTarget:"mouseover"==b.type&&b.fromElement?this.relatedTarget=b.fromElement:"mouseout"==b.type&&(this.relatedTarget=b.toElement),xOp6Dn?(this.pageX=b.clientX,this.pageY=b.clientY):xDef(b.pageX,b.pageY)?(this.pageX=b.pageX,this.pageY=b.pageY):xDef(b.clientX,b.clientY)&&(this.pageX=b.clientX+xScrollLeft(),this.pageY=b.clientY+xScrollTop()),xDef(b.offsetX,b.offsetY)?(this.offsetX=b.offsetX,this.offsetY=b.offsetY):xDef(b.layerX,b.layerY)?(this.offsetX=b.layerX,this.offsetY=b.layerY):(this.offsetX=this.pageX-xPageX(this.target),this.offsetY=this.pageY-xPageY(this.target)),b.keyCode?this.keyCode=b.keyCode:xDef(b.which)&&-1!=b.type.indexOf("key")&&(this.keyCode=b.which),this.shiftKey=b.shiftKey,this.ctrlKey=b.ctrlKey,this.altKey=b.altKey)}function xFirstChild(a,b){xDeprecate("xFirstChild");var c=a?a.firstChild:null;if(b)for(;c&&c.nodeName!=b;)c=c.nextSibling;else for(;c&&1!=c.nodeType;)c=c.nextSibling;return c}function xGetBodyWidth(){xDeprecate("xGetBodyWidth");var a=xClientWidth(),b=window.document.body.scrollWidth;return a>b?a:b}function xGetBodyHeight(){xDeprecate("xGetBodyHeight");var a=xClientHeight(),b=window.document.body.scrollHeight;return a>b?a:b}function xGetComputedStyle(a,b,d){xDeprecate("xGetComputedStyle");var e,f="undefined",g=document.defaultView;if(g&&g.getComputedStyle)e=g.getComputedStyle(a,""),e&&(f=e.getPropertyValue(b));else{if(!a.currentStyle)return null;var h=b.split("-");b=h[0];for(var i=1;i<h.length;++i)c=h[i].charAt(0),b+=h[i].replace(c,c.toUpperCase());f=a.currentStyle[b]}return d?parseInt(f)||0:f}function xGetCookie(a){xDeprecate("xGetCookie");var b=null,c=a+"=";if(document.cookie.length>0){var d=document.cookie.indexOf(c);if(-1!=d){d+=c.length;var e=document.cookie.indexOf(";",d);-1==e&&(e=document.cookie.length),b=unescape(document.cookie.substring(d,e))}}return b}function xGetElementById(a){return xDeprecate("xGetElementById"),"string"!=typeof a?a:a=document.getElementById?document.getElementById(a):document.all?document.all[a]:null}function xGetElementsByAttribute(a,b,c,d){xDeprecate("xGetElementsByAttribute");var e,f,g=new Array,h=new RegExp(c,"i");f=xGetElementsByTagName(a);for(var i=0;i<f.length;++i)e=f[i].getAttribute(b),e||(e=f[i][b]),"string"==typeof e&&-1!=e.search(h)&&(g[g.length]=f[i],d&&d(f[i]));return g}function xGetElementsByClassName(a,b,c,d){xDeprecate("xGetElementsByClassName");for(var e=new Array,f=new RegExp("\\b"+a+"\\b","i"),g=xGetElementsByTagName(c,b),h=0;h<g.length;++h)g[h].className&&-1!=g[h].className.search(f)&&(e[e.length]=g[h],d&&d(g[h]));return e}function xGetElementsByTagName(a,b){xDeprecate("xGetElementsByTagName");var c=null;return a=a||"*",b=b||document,xIE4||xIE5?c="*"==a?b.all:b.all.tags(a):b.getElementsByTagName&&(c=b.getElementsByTagName(a)),c||new Array}function xGetURLArguments(){xDeprecate("xGetURLArguments");var a=location.href.indexOf("?"),b=new Array;if(-1!=a)for(var c=location.href.substring(a+1,location.href.length).split("&"),d=0;d<c.length;d++)nameVal=c[d].split("="),b[d]=nameVal[1],b[nameVal[0]]=nameVal[1];return b}function xHeight(a,b){if(xDeprecate("xHeight"),!(a=xGetElementById(a)))return 0;b=xNum(b)?0>b?0:Math.round(b):-1;var c=xDef(a.style);if(a==document||"html"==a.tagName.toLowerCase()||"body"==a.tagName.toLowerCase())b=xClientHeight();else if(c&&xDef(a.offsetHeight)&&xStr(a.style.height)){if(b>=0){var d=0,e=0,f=0,g=0;if("CSS1Compat"==document.compatMode){var h=xGetComputedStyle;d=h(a,"padding-top",1),null!==d?(e=h(a,"padding-bottom",1),f=h(a,"border-top-width",1),g=h(a,"border-bottom-width",1)):xDef(a.offsetHeight,a.style.height)&&(a.style.height=b+"px",d=a.offsetHeight-b)}if(b-=d+e+f+g,isNaN(b)||0>b)return null;a.style.height=b+"px"}b=a.offsetHeight}else c&&xDef(a.style.pixelHeight)&&(b>=0&&(a.style.pixelHeight=b),b=a.style.pixelHeight);return b}function xHex(a,b,c){xDeprecate("xHex");var d="",e=Math.ceil(a);c&&(d=c),e=e.toString(16);for(var f=0;f<b-e.length;++f)d+="0";return d+e}function xHide(a){return xDeprecate("xHide"),xVisibility(a,0)}function xInnerHtml(a,b){if(xDeprecate("xInnerHtml"),!(a=xGetElementById(a))||!xStr(a.innerHTML))return null;var c=a.innerHTML;return xStr(b)&&(a.innerHTML=b),c}function xLeft(a,b){if(xDeprecate("xLeft"),!(a=xGetElementById(a)))return 0;var c=xDef(a.style);return c&&xStr(a.style.left)?xNum(b)?a.style.left=b+"px":(b=parseInt(a.style.left),isNaN(b)&&(b=0)):c&&xDef(a.style.pixelLeft)&&(xNum(b)?a.style.pixelLeft=b:b=a.style.pixelLeft),b}function xMoveTo(a,b,c){xDeprecate("xMoveTo"),xLeft(a,b),xTop(a,c)}function xName(a){return xDeprecate("xName"),a?a.id&&""!=a.id?a.id:a.name&&""!=a.name?a.name:a.nodeName&&""!=a.nodeName?a.nodeName:a.tagName&&""!=a.tagName?a.tagName:a:a}function xNextSib(a,b){xDeprecate("xNextSib");var c=a?a.nextSibling:null;if(b)for(;c&&c.nodeName!=b;)c=c.nextSibling;else for(;c&&1!=c.nodeType;)c=c.nextSibling;return c}function xNum(){xDeprecate("xNum");for(var a=0;a<arguments.length;++a)if(isNaN(arguments[a])||"number"!=typeof arguments[a])return!1;return!0}function xOffsetLeft(a){return xDeprecate("xOffsetLeft"),(a=xGetElementById(a))&&xDef(a.offsetLeft)?a.offsetLeft:0}function xOffsetTop(a){return xDeprecate("xOffsetTop"),(a=xGetElementById(a))&&xDef(a.offsetTop)?a.offsetTop:0}function xPad(a,b,c,d){if(xDeprecate("xPad"),"string"!=typeof a&&(a+=""),d)for(var e=a.length;b>e;++e)a=c+a;else for(e=a.length;b>e;++e)a+=c;return a}function xPageX(a){if(xDeprecate("xPageX"),!(a=xGetElementById(a)))return 0;for(var b=0;a;)xDef(a.offsetLeft)&&(b+=a.offsetLeft),a=xDef(a.offsetParent)?a.offsetParent:null;return b}function xPageY(a){if(xDeprecate("xPageY"),!(a=xGetElementById(a)))return 0;for(var b=0;a;)xDef(a.offsetTop)&&(b+=a.offsetTop),a=xDef(a.offsetParent)?a.offsetParent:null;return b}function xParent(a,b){if(xDeprecate("xParent"),!(a=xGetElementById(a)))return null;var c=null;return!b&&xDef(a.offsetParent)?c=a.offsetParent:xDef(a.parentNode)?c=a.parentNode:xDef(a.parentElement)&&(c=a.parentElement),c}function xPreventDefault(a){xDeprecate("xPreventDefault"),a&&a.preventDefault?a.preventDefault():window.event&&(window.event.returnValue=!1)}function xPrevSib(a,b){xDeprecate("xPrevSib");var c=a?a.previousSibling:null;if(b)for(;c&&c.nodeName!=b;)c=c.previousSibling;else for(;c&&1!=c.nodeType;)c=c.previousSibling;return c}function xRemoveEventListener(e,eT,eL,cap){if(xDeprecate("xRemoveEventListener"),e=xGetElementById(e)){if(eT=eT.toLowerCase(),!xIE4Up&&!xOp7Up&&e==window){if("resize"==eT)return void(window.xREL=null);if("scroll"==eT)return void(window.xSEL=null)}var eh="e.on"+eT+"=null";e.removeEventListener?e.removeEventListener(eT,eL,cap):e.detachEvent?e.detachEvent("on"+eT,eL):eval(eh)}}function xResizeTo(a,b,c){xDeprecate("xResizeTo"),xWidth(a,b),xHeight(a,c)}function xScrollLeft(a,b){xDeprecate("xScrollLeft");var c=0;if(!xDef(a)||b||a==document||"html"==a.tagName.toLowerCase()||"body"==a.tagName.toLowerCase()){var d=window;b&&a&&(d=a),d.document.documentElement&&d.document.documentElement.scrollLeft?c=d.document.documentElement.scrollLeft:d.document.body&&xDef(d.document.body.scrollLeft)&&(c=d.document.body.scrollLeft)}else a=xGetElementById(a),a&&xNum(a.scrollLeft)&&(c=a.scrollLeft);return c}function xScrollTop(a,b){xDeprecate("xScrollTop");var c=0;if(!xDef(a)||b||a==document||"html"==a.tagName.toLowerCase()||"body"==a.tagName.toLowerCase()){var d=window;b&&a&&(d=a),d.document.documentElement&&d.document.documentElement.scrollTop?c=d.document.documentElement.scrollTop:d.document.body&&xDef(d.document.body.scrollTop)&&(c=d.document.body.scrollTop)}else a=xGetElementById(a),a&&xNum(a.scrollTop)&&(c=a.scrollTop);return c}function xSetCookie(a,b,c,d){xDeprecate("xSetCookie"),document.cookie=a+"="+escape(b)+(c?"; expires="+c.toGMTString():"")+"; path="+(d?d:"/")}function xShow(a){return xDeprecate("xShow"),xVisibility(a,1)}function xStr(){xDeprecate("xStr");for(var a=0;a<arguments.length;++a)if("string"!=typeof arguments[a])return!1;return!0}function xTop(a,b){if(xDeprecate("xTop"),!(a=xGetElementById(a)))return 0;var c=xDef(a.style);return c&&xStr(a.style.top)?xNum(b)?a.style.top=b+"px":(b=parseInt(a.style.top),isNaN(b)&&(b=0)):c&&xDef(a.style.pixelTop)&&(xNum(b)?a.style.pixelTop=b:b=a.style.pixelTop),b}function xVisibility(a,b){return xDeprecate("xVisibility"),(a=xGetElementById(a))&&a.style&&xDef(a.style.visibility)?(xDef(b)&&(a.style.visibility=b?"visible":"hidden"),a.style.visibility):null}function xWidth(a,b){if(xDeprecate("xWidth"),!(a=xGetElementById(a)))return 0;b=xNum(b)?0>b?0:Math.round(b):-1;var c=xDef(a.style);if(a==document||"html"==a.tagName.toLowerCase()||"body"==a.tagName.toLowerCase())b=xClientWidth();else if(c&&xDef(a.offsetWidth)&&xStr(a.style.width)){if(b>=0){var d=0,e=0,f=0,g=0;if("CSS1Compat"==document.compatMode){var h=xGetComputedStyle;d=h(a,"padding-left",1),null!==d?(e=h(a,"padding-right",1),f=h(a,"border-left-width",1),g=h(a,"border-right-width",1)):xDef(a.offsetWidth,a.style.width)&&(a.style.width=b+"px",d=a.offsetWidth-b)}if(b-=d+e+f+g,isNaN(b)||0>b)return null;a.style.width=b+"px"}b=a.offsetWidth}else c&&xDef(a.style.pixelWidth)&&(b>=0&&(a.style.pixelWidth=b),b=a.style.pixelWidth);return b}function xZIndex(a,b){return xDeprecate("xZIndex"),(a=xGetElementById(a))?(a.style&&xDef(a.style.zIndex)&&(xNum(b)&&(a.style.zIndex=b),b=parseInt(a.style.zIndex)),b):0}function xStopPropagation(a){xDeprecate("xStopPropagation"),a&&a.stopPropagation?a.stopPropagation():window.event&&(window.event.cancelBubble=!0)}var xOp7Up,xOp6Dn,xIE4Up,xIE4,xIE5,xIE6,xNN4,xUA=navigator.userAgent.toLowerCase();if(window.opera){var i=xUA.indexOf("opera");if(-1!=i){var v=parseInt(xUA.charAt(i+6));xOp7Up=v>=7,xOp6Dn=7>v}}else"KDE"!=navigator.vendor&&document.all&&-1!=xUA.indexOf("msie")?(xIE4Up=parseFloat(navigator.appVersion)>=4,xIE4=-1!=xUA.indexOf("msie 4"),xIE5=-1!=xUA.indexOf("msie 5"),xIE6=-1!=xUA.indexOf("msie 6")):document.layers&&(xNN4=!0);var xMac=-1!=xUA.indexOf("mac"),xFF=-1!=xUA.indexOf("firefox");
\ No newline at end of file
diff --git a/modules/admin/tpl/js/admin.min.js b/modules/admin/tpl/js/admin.min.js
index a161a76d7..a1711a906 100644
--- a/modules/admin/tpl/js/admin.min.js
+++ b/modules/admin/tpl/js/admin.min.js
@@ -1,2 +1,2 @@
-function doInstallModule(a){var b=[];b.module_name=a,exec_xml("install","procInstallAdminInstall",b,completeInstallModule)}function doUpdateModule(a){var b=[];b.module_name=a,exec_xml("install","procInstallAdminUpdate",b,completeInstallModule)}function completeInstallModule(a){alert(a.message),location.reload()}function getOffset(a,b){for(var c=0,d=0;a&&a!=b;)c+=a.offsetTop,d+=a.offsetLeft,a=a.offsetParent;return{top:c,left:d}}jQuery(function(a){function b(){var b=a(".x>.body"),c=b.find(">.gnb"),d=b.children("#content.content");d.width("99.99%"),setTimeout(function(){d.removeAttr("style"),c.height()>d.height()&&d.height(c.height())},100)}if(window.scrollTo(0,0),a(document.body).on("click",".x [data-toggle]",function(){var b=a(this);if(b.is("a")&&b.attr("href")!=b.attr("data-toggle")){var c=b.attr("href");b.attr("data-toggle",c)}var d=a(b.attr("data-toggle")),e="a,input,button,textarea,select";return d.toggle(),d.is(":visible")&&!d.find(e).length?d.not(":disabled").attr("tabindex","0").focus():d.is(":visible")&&d.find(e).length?d.not(":disabled").find(e).eq(0).focus():b.focus(),!1}),a(document.body).on("click",".x [data-show]",function(){var b=a(this);if(b.is("a")&&b.attr("href")!=b.attr("data-show")){var c=b.attr("href");b.attr("data-show",c)}return a(b.attr("data-show")).show().attr("tabindex","0").focus(),!1}),a(document.body).on("click",".x [data-hide]",function(){var b=a(this);if(b.is("a")&&b.attr("href")!=b.attr("data-hide")){var c=b.attr("href");b.attr("data-hide",c)}return a(b.attr("data-hide")).hide(),b.focus(),!1}),a.fn.xeTabbable=function(){a(this).each(function(){var b=a(this);b.find(">.x_nav-tabs>li>a").each(function(b){a(this).attr("data-index",b+1)}),b.find(">.x_tab-content>.x_tab-pane").each(function(b){a(this).attr("data-index",b+1)})}),a('.x .x_tab-content>.x_tab-pane:not(".x_active")').hide()},a(".x .x_tabbable").xeTabbable(),a(document.body).on("click",'.x .x_nav-tabs>li>a[href^="#"]',function(){var b=a(this);return b.parent("li").hasClass("x_disabled")?!1:(b.parent("li").addClass("x_active").siblings().removeClass("x_active"),b.closest(".x_nav-tabs").next(".x_tab-content").find(">.x_tab-pane").eq(b.attr("data-index")-1).addClass("x_active").show().siblings(".x_tab-pane").removeClass("x_active").hide(),b.parents(".x_tabbable").trigger("tab_change",[parseInt(b.attr("data-index"))-1,b]),!1)}),a.fn.gnb=function(){var c=a(".x>.body"),d=c.find(">.gnb"),e=d.find(">ul>li"),f=new Date;f.setTime(f.getTime()+30758400),e.find(">a").prepend("<i />"),e.find(">ul").prev("a").append("<b />"),e.each(function(b){a(this).attr("data-index",b+1)});var g=e.find(">ul>li.active_").closest("li.active").attr("data-index");e.find(">ul>li.active_").clone().addClass("active").attr("data-index",g).prependTo("#gnbNav").find(">a").prepend("<i />"),e.find(">a").click(function(){function d(){c.removeClass("wide"),b()}var e=a(this),g=a(this).parent("li"),h=g.hasClass("open"),i=g.hasClass("active"),j=g.find(">ul").length>=1,k=c.hasClass("wide");return h||i||!j?h&&!i&&j&&!k?(g.removeClass("open").find(">ul").slideUp(100),d(),setCookie("__xe_admin_gnb_tx_"+e.data("href"),"close",f),!1):k&&!j||i||k&&h?(d(),!1):void 0:(g.addClass("open").find(">ul").slideDown(100),d(),setCookie("__xe_admin_gnb_tx_"+e.data("href"),"open",f),!1)}),d.find('>a[href="#gnbNav"]').click(function(){return a(this).parent(".gnb").toggleClass("open"),c.toggleClass("wide"),a(window).width()<=980&&!d.hasClass("open")&&a("#gnbNav").removeClass("ex"),b(),a(this).parent(".gnb").hasClass("open")?setCookie("__xe_admin_gnb_status","open",f):setCookie("__xe_admin_gnb_status","close",f),!1}),d.find(".exMenu>button").click(function(){a("#gnbNav").toggleClass("ex"),b(),a("#gnbNav").hasClass("ex")?setCookie("__xe_admin_gnb_ex_status","open",f):setCookie("__xe_admin_gnb_ex_status","close",f)});var h=getCookie("__xe_admin_gnb_status");h&&setCookie("__xe_admin_gnb_status",h,f);var i=getCookie("__xe_admin_gnb_ex_status");if(i&&setCookie("__xe_admin_gnb_xe_status",i,f),"undefined"!=typeof __xe_admin_gnb_txs)for(var j in __xe_admin_gnb_txs){var k=__xe_admin_gnb_txs[j],l=getCookie(k);setCookie(k,l,f)}},a(".gnb").gnb(),a(".x #lang").mouseleave(function(){a(this).hide()}).focusout(function(){var b=a(this);setTimeout(function(){b.find("a:focus").length||b.mouseleave()},500)}),a(".x th :checkbox").change(function(){var b=a(this),c=b.data("name");b.closest("table").find(":checkbox").filter(function(){var b=a(this);return!b.prop("disabled")&&(b.attr("name")==c||b.data("name")==c)}).prop("checked",b.prop("checked")).end().end().trigger("update.checkbox",[c,this.checked])}),a(document.body).on("click",".x .x_pagination .x_disabled, .x .x_pagination .x_active",function(){return!1}),a(".x .section").length>1){var c=a(".x .section").find(">h1:first");c.each(function(){var b=a(this);b.next().length&&b.append('<button type="button" class="snToggle x_icon-chevron-up">Toggle this section</button>')}),a(".x .section.collapsed>h1>.snToggle").removeClass("x_icon-chevron-up").addClass("x_icon-chevron-down"),c.click(function(){var c=a(this),d=a(this).find(">.snToggle"),e=c.closest(".section");e.hasClass("collapsed")?(e.removeClass("collapsed"),d.removeClass("x_icon-chevron-down").addClass("x_icon-chevron-up")):(e.addClass("collapsed"),d.removeClass("x_icon-chevron-up").addClass("x_icon-chevron-down")),b()})}var d=a(".x .x_alert");d.prepend('<button type="button" class="x_close">&times;</button>'),d.children(".x_close").click(function(){a(this).parent(".x_alert").hide()}),a(".x .x_btn").click(function(){return a(this).hasClass("x_disabled")?!1:void 0}),a.fn.vr=function(){this.each(function(){var b=a(this);"|"==b.text()&&b.addClass("vr").filter(":first-child, :last-child").remove()})},a(".x i").vr(),a.fn.labelMaker=function(){this.each(function(b){b+=1;var c=a(this),d="input, textarea, select",e=":radio, :checkbox",f="[id]",g="i"+b;c.next(d).filter(f).not(e).length?c.attr("for",c.next().attr("id")):c.next(d).not(f).not(e).length?c.attr("for",g).next().attr("id",g):c.prev(e).filter(f).length?c.attr("for",c.prev().attr("id")):c.prev(e).not(f).length?c.attr("for",g).prev().attr("id",g):c.children(d).filter(f).length?c.attr("for",c.children(d).filter(f).eq(0).attr("id")):c.children(d).not(f).length&&c.attr("for",g).children(d).not(f).eq(0).attr("id",g)})},a("label:not([for])").labelMaker(),a.fn.checkToggle=function(){function b(){setTimeout(function(){a(":checked").parent("label").addClass("checked"),a(':not(":checked")').parent("label").removeClass("checked")},0)}this.change(b),b()},a(":radio, :checkbox").checkToggle(),a.fn.fileTypeOverlap=function(){this.each(function(){var b=a(this);b.wrap('<span class="fileBtn x_btn" />').before(b.attr("title"))})},a('input[type="file"].overlap').fileTypeOverlap(),a.fn.tableSpan=function(){this.each(function(){var b=a(this),c=b.find(">thead>tr:eq(0)>th").length,d=b.find(">tbody>tr:eq(0)>td:only-child");c!=d.attr("colspan")&&d.attr("colspan",c).css("text-align","center")})},a("table").tableSpan()}),jQuery(function(a){var b=27,c=[],d=1040,e=a('<div class="x_modal-backdrop"></div>').appendTo("body").hide();a.fn.xeModalWindow=function(){this.not(".xe-modal-window").addClass("xe-modal-window").each(function(){a(a(this).attr("href")).addClass("x").hide()}).click(function(){var b,c=a(this);return b=a(c.attr("href")),c.trigger("showing"==b.data("state")?"close.mw":"open.mw"),!1}).bind("open.mw",function(){function f(){k.trigger("after-open.mw")}var g,h,i,j,k=a(this);if(g=a(k.attr("href")),!c.length||c[c.length-1].get(0)!=g.get(0)){if(g.parent("body").length||(h=a('<button type="button" class="x_close">&times;</button>'),h.click(function(){g.data("anchor").trigger("close.mw")}),g.find("[data-hide]").click(function(){g.data("anchor").trigger("close.mw")}),a("body").append(g),g.prepend(h)),g.data("anchor",k),i=a.Event("before-open.mw"),k.trigger(i),i.isDefaultPrevented())return!1;j=k.data("duration")||"fast",g.data("state","showing"),a(document).bind("keydown.mw",function(a){return a.which==b?(k.trigger("close.mw"),!1):void 0}),g.fadeIn(j,f).find("button.x_close:first").focus(),a("body").css("overflow","hidden"),c.push(g);var l=d+2*(c.length-1);e.css("z-index",l).show(),g.css("z-index",l+1)}}).bind("close.mw",function(){function b(){i.trigger("after-close.mw")}var f,g,h,i=a(this);if(g=a(i.attr("href")),!c.length||c[c.length-1].get(0)==g.get(0)){if(f=a.Event("before-close.mw"),i.trigger(f),f.isDefaultPrevented())return!1;h=i.data("duration")||"fast",g.data("state","hiding"),g.fadeOut(h,b),a("body").css("overflow","auto"),i.focus(),c.pop();var j=d+2*(c.length-1);c.length?e.css("z-index",j):e.hide()}}),a("div.x_modal").addClass("x")},a("a.modalAnchor").xeModalWindow()}),jQuery(function(a){var b=!1,c=27;a.fn.xeContentToggler=function(){return this.not(".xe-content-toggler").addClass("xe-content-toggler").each(function(){var c=a(this);$layer=a(c.attr("href")),$layer.hide().not(".xe-toggling-content").addClass("xe-toggling-content").mousedown(function(){b=!0}).focusout(function(){setTimeout(function(){b||$layer.find(":focus").length||"showing"!=$layer.data("state")||c.trigger("close.tc"),b=!1},1)})}).click(function(){var b,c=a(this);return b=a(c.attr("href")),b.data("anchor",c),c.trigger("showing"==b.data("state")?"close.tc":"open.tc"),!1}).bind("open.tc",function(){function d(){h.trigger("after-open.tc")}var e,f,g,h=a(this);switch(e=a(h.attr("href")),f=h.data("effect"),g=h.data("duration")||"fast",e.data("state","showing"),h.trigger("before-open.tc"),b=!1,a(document).unbind("mousedown.tc keydown.tc").bind("mousedown.tc keydown.tc",function(b){if(b){if("keydown"==b.type&&b.which!=c)return!0;if("mousedown"==b.type){var d=a(b.target);if(d.is("html,.tgAnchor,.tgContent")||e.has(d).length)return!0}}return h.trigger("close.tc"),!1}),f){case"slide":e.slideDown(g,d);break;case"slide-h":var i=e.css({"overflow-x":"",width:""}).width();e.show().css({"overflow-x":"hidden",width:"0px"}).animate({width:i},g,function(){e.css({"overflow-x":"",width:""}),d()});break;case"fade":e.fadeIn(g,d);break;default:e.show(),h.trigger("after-open.tc")}}).bind("close.tc",function(){function b(){f.trigger("after-close.tc")}var c,d,e,f=a(this);switch(a(document).unbind("mousedown.tc keydown.tc"),c=a(f.attr("href")),d=f.data("effect"),e=f.data("duration")||"fast",c.data("state","hiding"),f.trigger("before-close.tc"),d){case"slide":c.slideUp(e,b);break;case"slide-h":c.animate({width:0},e,function(){c.hide(),b()});break;case"fade":c.fadeOut(e,b);break;default:c.hide(),f.trigger("after-close.tc")}}),this},a("a.tgAnchor").xeContentToggler()}),jQuery(function(a){a.fn.xeModuleFinder=function(){return this.not(".xe-module-finder").addClass("xe-module-finder").find("a.tgAnchor.findsite").bind("before-open.tc",function(){function b(b){var e,f,g,h=b.site_list;if(d.empty(),c.closest(".modulefinder").find(".moduleList,.moduleIdList").attr("disabled","disabled"),b.error||!a.isArray(h))return void c.trigger("close.tc");for(f=0,g=h.length;g>f;f++)e=a("<li />").appendTo(d),a('<button type="button" />').text(h[f].domain).data("site_srl",h[f].site_srl).appendTo(e)}var c,d,e;c=a(this),d=a(c.attr("href")).find(">ul"),e=c.prev("input:text").val(),a.exec_json("admin.getSiteAllList",{domain:e},b)}).end().find(".tgContent.suggestion").delegate("button","click",function(){function b(b){var c,e,f=b.module_list;if(!b.error&&f){c=d.find(".moduleList").data("module_list",f).removeAttr("disabled").empty();for(e in f)f.hasOwnProperty(e)&&a("<option />").attr("value",e).text(f[e].title).appendTo(c);c.prop("selectedIndex",0).change().focus(),c.is(":visible")||c.slideDown(100,function(){d.find(".moduleIdList:not(:visible)").slideDown(100).trigger("show")}).trigger("show")}}var c,d;c=a(this),d=c.closest(".modulefinder"),d.find("a.tgAnchor.findsite").trigger("close.tc"),a.exec_json("module.procModuleAdminGetList",{site_srl:c.data("site_srl")},b)}).end().find(".moduleList,.moduleIdList").hide().end().find(".moduleList").change(function(){var b,c,d,e;if(b=a(this),d=b.val(),e=b.data("module_list"),e[d]){e=e[d].list,c=b.closest(".modulefinder").find(".moduleIdList").removeAttr("disabled").empty();for(var f in e)e.hasOwnProperty(f)&&a("<option />").attr("value",e[f].module_srl).text(e[f].browser_title).appendTo(c);c.prop("selectedIndex",0).change()}}),this},a(".modulefinder").xeModuleFinder()}),jQuery(function(a){var b=0;_xeModuleSearch=function(){var d=this,e=a(this),f=e.data("multiple");f||(f="");var g="__module_searcher_"+b;return b++,a.exec_json("module.getModuleAdminModuleSearcherHtml",{id:g,is_multiple:f},function(b){function f(a,b){var c;a.find("li div").width(""),a.css("height","auto"),a.css("overflow-y",""),a.height()>b&&(c=a.find("li div"),c.width(c.width()-20+"px"),a.css("height",b+"px"),a.css("overflow-y","auto"))}function h(b){var d,e=new RegExp(b,"ig"),g=j,h=function(a){return'<span class="highlight">'+a+"</span>"};for(o.empty(),i=0,c=g.length;c>i;i++){if(d=g[i].domain,b){if(!d.match(e))continue;d=d.replace(e,h)}$li=a("<li />").appendTo(o),a("<a>").attr("href","#").html(d).data("site_srl",g[i].site_srl).appendTo($li)}f(o,s-r.parent("div").height()),1==g.length&&o.find("a").trigger("click")}if(b&&b.html){e.after(b.html).addClass("tgAnchor").attr("href","#"+g).xeContentToggler();var j,k=e.next(".moduleWindow"),l=k.find(".siteList"),m=k.find(".moduleList"),n=k.find(".instanceList"),o=l.find(">ul"),p=m.find(">ul"),q=n.find(">select"),r=k.find("input.siteFinder"),s=280;r.keyup(function(){h(r.val())}),"undefined"==typeof console&&(console={log:function(){}}),e.not(".xe-module-search").addClass("xe-module-search").parent().find(".moduleTrigger").bind("before-open.tc",function(){function b(b){var d=b.site_list;return b.error||!a.isArray(d)?void c.trigger("close.tc"):(j=d,h(r.val()),void r.focus())}var c;c=a(this),o.empty(),q.empty(),m.hide(),n.hide(),a.exec_json("admin.getSiteAllList",{domain:""},b)}),k.find(".siteList>ul").delegate("a","click",function(b){function c(b){var c,e=b.module_list;if(!b.error&&e){for(c in e)e.hasOwnProperty(c)&&($li=a("<li />").appendTo(p),a("<a>").attr("href","#").html(e[c].title).data("moduleInstanceList",e[c].list).appendTo($li));k.find(".moduleList").show(),f(p,s),o.find("li").removeClass("x_active"),d.parent("li").addClass("x_active")}}var d,e;d=a(this),e=d.closest(".moduleSearch"),p.empty(),n.hide(),a.exec_json("module.procModuleAdminGetList",{site_srl:d.data("site_srl")},c),b.preventDefault()}).end().find(".moduleList>ul").delegate("a","click",function(b){var c,e;if(c=a(this),e=c.data("moduleInstanceList")){d.sSelectedModuleType=c.text(),q.empty();for(var g in e)e.hasOwnProperty(g)&&($li=a("<option />").html(e[g].browser_title+" ("+e[g].mid+")").appendTo(q).val(e[g].module_srl).data("mid",e[g].mid).data("module_srl",e[g].module_srl).data("layout_srl",e[g].layout_srl).data("browser_title",e[g].browser_title));n.show(),f(q,s),p.find("li").removeClass("x_active"),c.parent("li").addClass("x_active"),b.preventDefault()}}).end().find(".moduleSearch_ok").click(function(b){var c=[];q.find("option:selected").each(function(){c.push({type:d.sSelectedModuleType,module_srl:a(this).data("module_srl"),layout_srl:a(this).data("layout_srl"),browser_title:a(this).data("browser_title"),mid:a(this).data("mid")})}),e.trigger("moduleSelect",[c]),a(".moduleTrigger").trigger("close.tc"),b.preventDefault()})}}),this},a.fn.xeModuleSearch=function(){a(this).each(_xeModuleSearch)},a.fn.xeModuleSearchHtml=function(){var b=0;return a(this).each(function(){var c=a(this),d=c.attr("id");d||(d="__module_search_"+b),b++;var e=a('<a class="x_btn moduleTrigger">'+xe.cmd_find+"</a>"),f=a('<input type="text" readonly>');c.after(e).after("&nbsp;").after(f).hide(),e.xeModuleSearch(),e.bind("moduleSelect",function(a,b){f.val(b[0].browser_title+" ("+b[0].mid+")"),c.val(b[0].module_srl)}),c.val()&&a.exec_json("module.getModuleAdminModuleInfo",{search_module_srl:c.val()},function(a){a&&a.module_info&&f.val(a.module_info.browser_title+" ("+a.module_info.mid+")")})}),this}}),jQuery(function(a){var b=a.fn.hide;a.fn.hide=function(c,d,e,f){a(this).trigger("hide",[f]),a(this).find(".active").removeClass("active");var g=a(this).attr("id");return a(this).hasClass("col")&&(a(this).next().hide(c,d,e,f),g&&a(this).parent().find('a[href="#'+g+'"]').parent("li.active").removeClass("active")),b.apply(this,arguments)};var c=a.fn.show;a.fn.show=function(b,d,e,f){if(a(this).trigger("show",[f]),a(this).hasClass("col")){a(this).next().hide(b,d,e,f);var g=a(this).parent();setTimeout(function(){g.scrollTo(g.width(),0,{duration:0})},0)}var h=c.apply(this,arguments),i=a(this);return setTimeout(function(){i.trigger("after-show",[f])},0),h}}),jQuery(function(a){a.xeMsgBox={htOptions:{}};var b=a.xeMsgBox.$msgBox=a("<section />").addClass("x_modal _common x").hide().css("z-index",9999);b.html('<button type="button" class="x_close _cancel">&times;</button> <div class="x_modal-header"> <h1 class="_title"></h1> </div> <div class="x_modal-body"> <div class="_text"></div> </div> <div class="x_modal-footer"> <button type="button" class="x_btn x_pull-left _cancel">'+xe.cmd_cancel+'</button> <button type="submit" class="x_btn x_btn-inverse x_pull-right x_btn-primary _ok">'+xe.cmd_confirm+"</button> </div> "),a("body").append(b),b.find("._ok").click(function(){a.xeMsgBox.fnOnOK()}),b.find("._cancel").click(function(){a.xeMsgBox.fnOnCancel()}),b.bind("show",function(){a.xeMsgBox.bVisible=!0,a.xeMsgBox._showFoggy(),a.xeMsgBox.fnOnShow(),b.find("input,button").length>0&&setTimeout(function(){b.find("input,button").each(function(b,c){var d=a(c);return d.is(":visible")?(d.focus(),!1):void 0})},0)}),b.bind("hide",function(){a.xeMsgBox.bVisible=!1,a.xeMsgBox._hideFoggy(),a.xeMsgBox.fnOnHide()}),a(document.body).on("keydown",function(c){a.xeMsgBox.bVisible&&27===c.keyCode&&(b.find("._cancel").click(),c.preventDefault())}),a.xeMsgBox.fnOnOK=function(){"function"==typeof a.xeMsgBox.htOptions.fnOnOK&&a.xeMsgBox.htOptions.fnOnOK()||b.hide()},a.xeMsgBox.fnOnCancel=function(){"function"==typeof a.xeMsgBox.htOptions.fnOnCancel&&a.xeMsgBox.htOptions.fnOnCancel(),b.hide()},a.xeMsgBox.fnOnShow=function(){"function"==typeof a.xeMsgBox.htOptions.fnOnShow&&a.xeMsgBox.htOptions.fnOnShow()},a.xeMsgBox.fnOnHide=function(){"function"==typeof a.xeMsgBox.htOptions.fnOnHide&&a.xeMsgBox.htOptions.fnOnHide()},a.xeMsgBox.showMsgBox=function(c){a('head>link[rel="stylesheet"]:last').after('<link rel="stylesheet" href="./modules/menu/tpl/css/themes/default/style.css" />'),c=a.xeMsgBox.htOptions=c||{};var d=c.sTitle||"",e=c.sText||"",f=c.bDanger||!1;b.find("._title").html(d),b.find("._text").html(e),""===e?b.addClass("_nobody"):b.removeClass("_nobody");var g=b.find("._ok");f?(g.removeClass("x_btn-inverse"),g.addClass("x_btn-danger")):(g.removeClass("x_btn-danger"),g.addClass("x_btn-inverse")),c.bSmall?b.addClass("_small"):b.removeClass("_small"),c.bAlert?b.addClass("_type_alert"):b.removeClass("_type_alert"),b.show()},a.xeMsgBox.alertDialog=function(a){a=a||{},a.bAlert=!0,this.showMsgBox(a)},a.xeMsgBox.alert=function(a){htOptions={bAlert:!0,bNobody:!0,bSmall:!0,sText:a},this.showMsgBox(htOptions)},a.xeMsgBox.confirmDialog=function(a){a=a||{},a.bAlert=!1,this.showMsgBox(a)};var c=a.xeMsgBox.$foggyLayer=a("<div />");c.css({position:"fixed",top:0,left:0,backgroundColor:"#000",opacity:.5,display:"none",zIndex:9998}),a(a.find("body")).append(c),a.xeMsgBox._resizeFoggy=function(){c.css({width:0,height:0}),setTimeout(function(){c.css({width:a(document).width(),height:a(document).height()})},0)},a(window).resize(a.xeMsgBox._resizeFoggy),a.xeMsgBox._resizeFoggy(),a.xeMsgBox._showFoggy=function(){c.show()},a.xeMsgBox._hideFoggy=function(){c.hide()}}),jQuery(function(a){a.xeFoggy={};var b=a.xeFoggy.$foggyLayer=a("<div />");b.css({position:"fixed",top:0,left:0,backgroundColor:"#000",opacity:.5,display:"none",zIndex:9998}),a("body").append(b),a.xeFoggy._resizeFoggy=function(){b.css({width:0,height:0}),setTimeout(function(){b.css({width:a(document).width(),height:a(document).height()})},0)},a(window).resize(a.xeFoggy._resizeFoggy),a.xeFoggy._resizeFoggy(),a.xeFoggy.show=function(a){b.css(a?{opacity:0}:{opacity:.5}),b.show()},a.xeFoggy.hide=function(){b.hide()}}),jQuery(function(a){var b=!1,c=a('<tr class="placeholder"><td>&nbsp;</td></tr>');a.fn.xeSortableTable=function(){return this.not(".xe-sortable-table").addClass("xe-sortable-table").delegate("button.dragBtn","mousedown.st",function(d){var e,f,g,h,i,j,k,l,m,n,o,p;if(1==d.which){if(e=a(this),f=e.closest("tr"),g=e.closest("table"),p=g.get(0).offsetParent,i=f.height(),j=f.width(),before_event=a.Event("before-drag.st"),g.trigger(before_event),before_event.isDefaultPrevented())return!1;l={x:d.pageX,y:d.pageY},k=getOffset(f.get(0),p),$clone=f.attr("target",!0).clone(!0).appendTo(g),o=(h=g.find("thead th")).length,h.filter("[colspan]").attr("colspan",function(a,b){o+=b-1}),c.find("td").attr("colspan",o),m=[],g.find("tbody>tr:not([target],.sticky,:hidden)").each(function(){var b,c=a(this);b=getOffset(this,p),m.push({top:b.top,bottom:b.top+c.height(),$item:c})}),$clone.addClass("draggable").css({position:"absolute",opacity:.6,width:j,height:i,left:k.left,top:k.top,zIndex:100}),c.css({position:"absolute",opacity:.6,width:j,height:"10px",left:k.left,top:k.top,backgroundColor:"#bbb",overflow:"hidden",zIndex:99}).appendTo(g),f.css("opacity",.6),a(document).unbind("mousedown.st mouseup.st").bind("mousemove.st",function(a){var b,d,e,f,g;for(n=null,b={x:l.x-a.pageX,y:l.y-a.pageY},d=k.top-b.y,e=0,f=m.length;f>e;e++)g=m[e],e&&g.top>d||f-1>e&&g.bottom<d||(n={element:g.$item},g.top>d-12?(n.state="before",c.css("top",g.top-5)):(n.state="after",c.css("top",g.bottom-5)));$clone.css({top:d})}).bind("mouseup.st",function(){var d;b=!1,a(document).unbind("mousemove.st mouseup.st"),f.removeAttr("target").css("opacity",""),$clone.remove(),c.remove(),n&&(d=a(n.element),d[n.state](f),g.trigger("after-drag.st"))})}}),this},a("table.sortable").xeSortableTable()}),jQuery(function(a){a(".filebox").bind("before-open.mw",function(){function b(e){d.html(e.html),d.find(".select").bind("click",function(){var b=a("input.select_checkbox:checked");if(0===b.length){var d=a(this).closest("tr").find("img.filebox_item").attr("src");d?(c.trigger("filebox.selected",[d]),c.trigger("close.mw")):alert("None selected!")}else c.trigger("filebox.selected",[b]),c.trigger("close.mw");return!1}),d.find(".x_pagination").find("a").filter(function(){return a(this).data("toggle")?!1:a(this).parent().hasClass("x_disabled")?!1:a(this).parent().hasClass("x_active")?!1:!0}).bind("click",function(){var c=a(this).attr("page");return a.exec_json("module.getFileBoxListHtml",{page:c},b),!1}),a("#goToFileBox").find("button").bind("click",function(){var c=a(this).prev("input").val();return a.exec_json("module.getFileBoxListHtml",{page:c},b),!1}),d.closest(".x_modal-body").scrollTop(0)}var c,d,e;c=a(this),e=c.attr("href"),d=a(e).find(".filebox_list"),a.exec_json("module.getFileBoxListHtml",{page:"1"},b)});var b=a(".x .dsTg .__simple"),c=a(".x .dsTg .__detail"),d=a(".x .dsTg td.title");d.each(function(){var b=a(this);0===b.find("p.x_alert").length&&b.addClass("tg").find(">*:not(:first-child)").hide()});var e=a(".x .dsTg td.tg>*:not(:first-child)");b.click(function(){e.hide(),c.removeClass("x_active"),b.addClass("x_active")}),c.click(function(){e.show(),c.addClass("x_active"),b.removeClass("x_active")})}),jQuery(function(a){a.fn.xeMultilingualWindow=function(b){function c(){return o.is(":visible")&&q&&confirm(xe.msg_confirm_save_and_use_multilingual)&&o.find(".save-useit").trigger("click"),!0}function d(){if(p.is(":visible")&&p.find(".editMode").length){var a=p.find(".editMode");confirm(xe.msg_confirm_save_and_use_multilingual)?a.find(".save").trigger("click"):a.find(".cancel").trigger("click")}return!0}function e(){return p.find(".item > fieldset").hide().prev("a").children("i").removeClass("x_icon-chevrom-up").addClass("x_icon-chevron-down"),n.find('[href="#lang_create"]').trigger("click"),o.find(".editMode").children("textarea").val(""),q=!1,!0}function f(a){a?(i(1,xe.current_lang,"",a,!1),n.find('[href="#lang_search"]').trigger("click",!0)):i(1,xe.current_lang,"","",!1)}function g(){return c()?d()?e()?void 0:!1:!1:!1}function h(a,b){var c=n.data("lang-target");q=!1,c&&c.trigger("selected.g11n",[a,b])}function i(c,d,e,f,g){"undefined"==typeof c&&(c=1),"undefined"==typeof d&&(d=xe.current_lang),"undefined"==typeof e&&(e=""),"undefined"==typeof f&&(f=""),"undefined"==typeof g&&(g=!0),a.exec_json("module.getModuleAdminLangListHtml",{page:c,lang_code:d,search_keyword:e,name:f,list_count:b.list_count,mid:current_url.getQuery("mid")},function(b){b&&b.html&&(p.html(b.html),j(),k(),l(),m(),g&&(document.location.href="#lang_search"),f&&a("#lang_search").find('[href^="#lang-"]').trigger("click"))})}function j(){p.find(".x_pagination a").click(function(){var b=a(this).data("page"),c=a(this).data("search_keyword"),d=a(this).data("current_lang");return b?(i(b,d,c),!1):void 0}),p.find(".x_pagination").submit(function(){var b=a(this).find('[name="page"]').val(),c=a(this).data("search_keyword"),d=a(this).data("current_lang");return b?(i(b,d,c),!1):!1})}function k(){p.find(".search").submit(function(){var b=a(this).find('[name="search_keyword"]').val(),c=a(this).find('[name="lang_code"]').val();return i(1,c,b),!1}),p.find("#search_cancel").click(function(){i(1,xe.current_lang,"")})}function l(){p.find(".set").append('<i class="x_icon-chevron-down"></i>').click(function(){function b(b){var d=c.next("fieldset").find("textarea");d.each(function(){var c=a(this),d=b.langs[c.data("lang")],e=/^\$user_lang->/;e.test(d)?c.val("").data("value",""):c.val(d).data("value",d)}),c.data("is_loaded",!0)}var c=a(this),e=c.data("lang_code");d();var f="x_icon-chevron-up",g="x_icon-chevron-down";c.next("fieldset").is(":visible")?c.children("i").removeClass(f).addClass(g):(c.parent(".item").siblings(".item").find("a > i").removeClass(f).addClass(g).end().children("fieldset").hide(),c.children("i").removeClass(g).addClass(f)),"undefined"==typeof c.data("is_loaded")&&a.exec_json("module.getModuleAdminLangCode",{name:e,mid:current_url.getQuery("mid")},b)})}function m(){b.view_use||p.find(".useit").hide(),b.view_modify||p.find(".modify").hide(),b.view_delete||p.find(".delete").hide(),"save"==b.modify_type&&p.find(".save").text(xe.cmd_save),p.find(".modify").click(function(){a(this).closest("fieldset").addClass("editMode").find("textarea").removeAttr("disabled"),a(this).siblings(".cancel").prependTo(a(this).parent()),a(this).siblings(".delete").attr("disabled","disabled")}),p.find(".cancel").click(function(){return a(this).closest("fieldset").removeClass("editMode").find("textarea").attr("disabled","disabled").each(function(){var b=a(this);b.val(b.data("value"))}),a(this).siblings(".modify").prependTo(a(this).parent()),a(this).siblings(".delete").removeAttr("disabled"),!1}),p.find(".delete").click(function(){if(confirm(xe.confirm_delete)){var b=a(this);lang_name=b.closest(".item").find('[href^="#lang-"]').data("lang_code"),a.exec_json("module.procModuleAdminDeleteLang",{name:lang_name,mid:current_url.getQuery("mid")},function(a){if(a){if(a.error)return void alert(a.message);var b=p.find(".x_pagination"),c=b.data("page"),d=b.data("search_keyword"),e=b.data("lang_code");c||($page=1),i(c,e,d)}})}}),p.find(".item").submit(function(){var b=a(this),c=b.find(".editMode").children("textarea"),d=b.find('[href^="#lang-"]'),e={},f=null;return c.each(function(){var b=a(this);e[b.attr("class")]=b.val(),b.data("tmp_value",b.val()),xe.current_lang==b.attr("class")&&(f=b.val())}),e.lang_name=d.data("lang_code"),e.mid=current_url.getQuery("mid"),a.exec_json("module.procModuleAdminInsertLang",e,function(e){e&&!e.error&&e.name&&(c.each(function(){var b=a(this);b.data("value",b.data("tmp_value"))}),d.children("span").html(f),p.find(".cancel").trigger("click"),b.find(".useit").trigger("click"))}),!1}),p.find(".useit").click(function(){var b=a(this),c=b.closest(".item").find('[href^="#lang-"]'),d=c.data("lang_code"),e=c.children("span").text();h(d,e)})}var n=a(this),o=n.find("#lang_create"),p=n.find("#lang_search"),q=!1;return b=a.extend({create_type:"save_and_use",modify_type:"save_and_use",view_use:!0,view_modify:!0,view_delete:!1,list_count:5},b||{}),"save_and_use"!=b.create_type&&o.find(".save-useit").text(xe.cmd_save),n.find(".x_tabbable").xeTabbable(),o.find(".editMode textarea").change(function(){q=!0}),o.submit(function(){function c(a){a&&!a.error&&a.name&&("save_and_use"==b.create_type?h(a.name,g):(alert(a.message),e()))}var d=a(this),f={},g=null;return d.find(".editMode").children("textarea").each(function(){var b=a(this);f[b.attr("class")]=b.val(),xe.current_lang==b.attr("class")&&(g=b.val())}),g?(f.mid=current_url.getQuery("mid"),a.exec_json("module.procModuleAdminInsertLang",f,c),!1):(alert(xe.msg_empty_multilingual),!1)}),n.find('[href="#lang_search"]').click(function(a,b){"undefined"==typeof b&&i()}),n.bind("reset.g11n",function(){e()}),n.bind("before-open.g11n",function(a,b){f(b)}),n.bind("before-close.g11n",function(){return g()}),this}});var is_loaded_multilingual_window_html=!1;jQuery(function(a){a.fn.xeLoadMultilingualWindowHtml=function(){function b(b){var c=a("#content");a(b.html).appendTo(c).xeMultilingualWindow(),a(".lang_code").trigger("loaded-multilingualWindow")}return a.exec_json("module.getModuleAdminMultilingualHtml",{mid:current_url.getQuery("mid")},b),this}});var multilingual_id_count=0;jQuery(function(a){a.fn.xeApplyMultilingualUI=function(){return a(this).each(function(){function b(){function b(){g.val(l.val()).width(g.data("width")).removeAttr("disabled").data("active",!1),g.parent(".g11n").removeClass("active")}function f(){function c(a){if(a&&a.langs){var b=g.width();g.closest(".g11n").addClass("active"),g.val(a.langs[xe.current_lang]).attr("disabled","disabled").width(b-44).data("active",!0)}}b();var d=/^\$user_lang->/;d.test(g.val())&&a.exec_json("module.getModuleAdminLangCode",{name:g.val().replace("$user_lang->",""),mid:current_url.getQuery("mid")},c)}var g,h=a("#g11n"),i=c.width();g="TEXTAREA"==d.tagName||"textarea"==c.data("type")?a('<textarea id="lang_'+e+'" class="lang_code" style="width:'+i+'px" data-width="'+i+'">').data("lang-id",e):a('<input type="text" id="lang_'+e+'" class="lang_code" style="width:'+(i-28)+'px" data-width="'+(i-28)+'">').data("lang-id",e),g.attr("placeholder",c.attr("placeholder"));var j=a('<button type="button" class="x_add-on remover" title="'+xe.cmd_remove_multilingual_text+'"><i class="x_icon-remove"></i>'+xe.cmd_remove_multilingual_text+"</button>").data("lang-target",e),k=a('<a href="#g11n" class="x_add-on modalAnchor" title="'+xe.cmd_set_multilingual_text+'"><i class="x_icon-globe"></i>'+xe.cmd_set_multilingual_text+"</a>").data("lang-target",e);c.parent().addClass("g11n").addClass("x_input-append"),c.after(g,j,k),c.hide(),k.attr("href","#g11n").xeModalWindow(),g.bind("selected.g11n",function(a,b,c){var d=g.width();g.data("active")||(d-=44),g.width(d).attr("disabled","disabled").val(c).data("active",!0).parent(".g11n").addClass("active"),g.siblings("#"+g.data("lang-id")).val("$user_lang->"+b),k.trigger("close.mw")}),k.bind("open.mw",function(){a(this);g.data("active")?h.trigger("before-open.g11n",g.prev(".lang_code").val().replace("$user_lang->","")):h.trigger("before-open.g11n"),h.data("lang-target",g)}),k.bind("before-close.mw",function(){return h.trigger("before-close.g11n")}),j.click(function(){var b=a(this),c=a("#lang_"+b.data("lang-target"));if(c.data("active")){var d=c.width();c.val("").removeAttr("disabled").width(d+44).data("active",!1).parent(".g11n").removeClass("active"),b.siblings(".lang_code").val("")}});var l=c;g.bind("change keyup",function(){c=a(this),c.data("active")||l.val(c.val())}),c.bind("reload-multilingual",f),f()}is_loaded_multilingual_window_html||(a().xeLoadMultilingualWindowHtml(),is_loaded_multilingual_window_html=!0);var c=a(this),d=this;c.parent().hasClass("g11n")?c.siblings().remove():c.wrap("<span></span>");var e=c.attr("id");e||(e="__lang_code_"+multilingual_id_count,multilingual_id_count++,c.attr("id",e)),a("#g11n").length?b():c.bind("loaded-multilingualWindow",b)
+function doInstallModule(a){var b=[];b.module_name=a,exec_xml("install","procInstallAdminInstall",b,completeInstallModule)}function doUpdateModule(a){var b=[];b.module_name=a,exec_xml("install","procInstallAdminUpdate",b,completeInstallModule)}function completeInstallModule(a){alert(a.message),location.reload()}function getOffset(a,b){for(var c=0,d=0;a&&a!=b;)c+=a.offsetTop,d+=a.offsetLeft,a=a.offsetParent;return{top:c,left:d}}jQuery(function(a){function b(){var b=a(".x>.body"),c=b.find(">.gnb"),d=b.children("#content.content");d.width("99.99%"),setTimeout(function(){d.removeAttr("style"),c.height()>d.height()&&d.height(c.height())},100)}if(window.scrollTo(0,0),a(document.body).on("click",".x [data-toggle]",function(){var b=a(this);if(b.is("a")&&b.attr("href")!=b.attr("data-toggle")){var c=b.attr("href");b.attr("data-toggle",c)}var d=a(b.attr("data-toggle")),e="a,input,button,textarea,select";return d.toggle(),d.is(":visible")&&!d.find(e).length?d.not(":disabled").attr("tabindex","0").focus():d.is(":visible")&&d.find(e).length?d.not(":disabled").find(e).eq(0).focus():b.focus(),!1}),a(document.body).on("click",".x [data-show]",function(){var b=a(this);if(b.is("a")&&b.attr("href")!=b.attr("data-show")){var c=b.attr("href");b.attr("data-show",c)}return a(b.attr("data-show")).show().attr("tabindex","0").focus(),!1}),a(document.body).on("click",".x [data-hide]",function(){var b=a(this);if(b.is("a")&&b.attr("href")!=b.attr("data-hide")){var c=b.attr("href");b.attr("data-hide",c)}return a(b.attr("data-hide")).hide(),b.focus(),!1}),a.fn.xeTabbable=function(){a(this).each(function(){var b=a(this);b.find(">.x_nav-tabs>li>a").each(function(b){a(this).attr("data-index",b+1)}),b.find(">.x_tab-content>.x_tab-pane").each(function(b){a(this).attr("data-index",b+1)})}),a('.x .x_tab-content>.x_tab-pane:not(".x_active")').hide()},a(".x .x_tabbable").xeTabbable(),a(document.body).on("click",'.x .x_nav-tabs>li>a[href^="#"]',function(){var b=a(this);return b.parent("li").hasClass("x_disabled")?!1:(b.parent("li").addClass("x_active").siblings().removeClass("x_active"),b.closest(".x_nav-tabs").next(".x_tab-content").find(">.x_tab-pane").eq(b.attr("data-index")-1).addClass("x_active").show().siblings(".x_tab-pane").removeClass("x_active").hide(),b.parents(".x_tabbable").trigger("tab_change",[parseInt(b.attr("data-index"))-1,b]),!1)}),a.fn.gnb=function(){var c=a(".x>.body"),d=c.find(">.gnb"),e=d.find(">ul>li"),f=new Date;f.setTime(f.getTime()+30758400),e.find(">a").prepend("<i />"),e.find(">ul").prev("a").append("<b />"),e.each(function(b){a(this).attr("data-index",b+1)});var g=e.find(">ul>li.active_").closest("li.active").attr("data-index");e.find(">ul>li.active_").clone().addClass("active").attr("data-index",g).prependTo("#gnbNav").find(">a").prepend("<i />"),e.find(">a").click(function(){function d(){c.removeClass("wide"),b()}var e=a(this),g=a(this).parent("li"),h=g.hasClass("open"),i=g.hasClass("active"),j=g.find(">ul").length>=1,k=c.hasClass("wide");return h||i||!j?h&&!i&&j&&!k?(g.removeClass("open").find(">ul").slideUp(100),d(),setCookie("__xe_admin_gnb_tx_"+e.data("href"),"close",f),!1):k&&!j||i||k&&h?(d(),!1):void 0:(g.addClass("open").find(">ul").slideDown(100),d(),setCookie("__xe_admin_gnb_tx_"+e.data("href"),"open",f),!1)}),d.find('>a[href="#gnbNav"]').click(function(){return a(this).parent(".gnb").toggleClass("open"),c.toggleClass("wide"),a(window).width()<=980&&!d.hasClass("open")&&a("#gnbNav").removeClass("ex"),b(),a(this).parent(".gnb").hasClass("open")?setCookie("__xe_admin_gnb_status","open",f):setCookie("__xe_admin_gnb_status","close",f),!1}),d.find(".exMenu>button").click(function(){a("#gnbNav").toggleClass("ex"),b(),a("#gnbNav").hasClass("ex")?setCookie("__xe_admin_gnb_ex_status","open",f):setCookie("__xe_admin_gnb_ex_status","close",f)});var h=getCookie("__xe_admin_gnb_status");h&&setCookie("__xe_admin_gnb_status",h,f);var i=getCookie("__xe_admin_gnb_ex_status");if(i&&setCookie("__xe_admin_gnb_xe_status",i,f),"undefined"!=typeof __xe_admin_gnb_txs)for(var j in __xe_admin_gnb_txs){var k=__xe_admin_gnb_txs[j],l=getCookie(k);setCookie(k,l,f)}},a(".gnb").gnb(),a(".x #lang").mouseleave(function(){a(this).hide()}).focusout(function(){var b=a(this);setTimeout(function(){b.find("a:focus").length||b.mouseleave()},500)}),a(".x th :checkbox").change(function(){var b=a(this),c=b.data("name");b.closest("table").find(":checkbox").filter(function(){var b=a(this);return!b.prop("disabled")&&(b.attr("name")==c||b.data("name")==c)}).prop("checked",b.prop("checked")).end().end().trigger("update.checkbox",[c,this.checked])}),a(document.body).on("click",".x .x_pagination .x_disabled, .x .x_pagination .x_active",function(){return!1}),a(".x .section").length>1){var c=a(".x .section").find(">h1:first");c.each(function(){var b=a(this);b.next().length&&b.append('<button type="button" class="snToggle x_icon-chevron-up">Toggle this section</button>')}),a(".x .section.collapsed>h1>.snToggle").removeClass("x_icon-chevron-up").addClass("x_icon-chevron-down"),c.click(function(){var c=a(this),d=a(this).find(">.snToggle"),e=c.closest(".section");e.hasClass("collapsed")?(e.removeClass("collapsed"),d.removeClass("x_icon-chevron-down").addClass("x_icon-chevron-up")):(e.addClass("collapsed"),d.removeClass("x_icon-chevron-up").addClass("x_icon-chevron-down")),b()})}var d=a(".x .x_alert");d.prepend('<button type="button" class="x_close">&times;</button>'),d.children(".x_close").click(function(){a(this).parent(".x_alert").hide()}),a(".x .x_btn").click(function(){return a(this).hasClass("x_disabled")?!1:void 0}),a.fn.vr=function(){this.each(function(){var b=a(this);"|"==b.text()&&b.addClass("vr").filter(":first-child, :last-child").remove()})},a(".x i").vr(),a.fn.labelMaker=function(){this.each(function(b){b+=1;var c=a(this),d="input, textarea, select",e=":radio, :checkbox",f="[id]",g="i"+b;c.next(d).filter(f).not(e).length?c.attr("for",c.next().attr("id")):c.next(d).not(f).not(e).length?c.attr("for",g).next().attr("id",g):c.prev(e).filter(f).length?c.attr("for",c.prev().attr("id")):c.prev(e).not(f).length?c.attr("for",g).prev().attr("id",g):c.children(d).filter(f).length?c.attr("for",c.children(d).filter(f).eq(0).attr("id")):c.children(d).not(f).length&&c.attr("for",g).children(d).not(f).eq(0).attr("id",g)})},a("label:not([for])").labelMaker(),a.fn.checkToggle=function(){function b(){setTimeout(function(){a(":checked").parent("label").addClass("checked"),a(':not(":checked")').parent("label").removeClass("checked")},0)}this.change(b),b()},a(":radio, :checkbox").checkToggle(),a.fn.fileTypeOverlap=function(){this.each(function(){var b=a(this);b.wrap('<span class="fileBtn x_btn" />').before(b.attr("title"))})},a('input[type="file"].overlap').fileTypeOverlap(),a.fn.tableSpan=function(){this.each(function(){var b=a(this),c=b.find(">thead>tr:eq(0)>th").length,d=b.find(">tbody>tr:eq(0)>td:only-child");c!=d.attr("colspan")&&d.attr("colspan",c).css("text-align","center")})},a("table").tableSpan()}),jQuery(function(a){var b=27,c=[],d=1040,e=a('<div class="x_modal-backdrop"></div>').appendTo("body").hide();a.fn.xeModalWindow=function(){this.not(".xe-modal-window").addClass("xe-modal-window").each(function(){a(a(this).attr("href")).addClass("x").hide()}).click(function(){var b,c=a(this);return b=a(c.attr("href")),c.trigger("showing"==b.data("state")?"close.mw":"open.mw"),!1}).bind("open.mw",function(){function f(){k.trigger("after-open.mw")}var g,h,i,j,k=a(this);if(g=a(k.attr("href")),!c.length||c[c.length-1].get(0)!=g.get(0)){if(g.parent("body").length||(h=a('<button type="button" class="x_close">&times;</button>'),h.click(function(){g.data("anchor").trigger("close.mw")}),g.find("[data-hide]").click(function(){g.data("anchor").trigger("close.mw")}),a("body").append(g),g.prepend(h)),g.data("anchor",k),i=a.Event("before-open.mw"),k.trigger(i),i.isDefaultPrevented())return!1;j=k.data("duration")||"fast",g.data("state","showing"),a(document).bind("keydown.mw",function(a){return a.which==b?(k.trigger("close.mw"),!1):void 0}),g.fadeIn(j,f).find("button.x_close:first").focus(),a("body").css("overflow","hidden"),c.push(g);var l=d+2*(c.length-1);e.css("z-index",l).show(),g.css("z-index",l+1)}}).bind("close.mw",function(){function b(){i.trigger("after-close.mw")}var f,g,h,i=a(this);if(g=a(i.attr("href")),!c.length||c[c.length-1].get(0)==g.get(0)){if(f=a.Event("before-close.mw"),i.trigger(f),f.isDefaultPrevented())return!1;h=i.data("duration")||"fast",g.data("state","hiding"),g.fadeOut(h,b),a("body").css("overflow","auto"),i.focus(),c.pop();var j=d+2*(c.length-1);c.length?e.css("z-index",j):e.hide()}}),a("div.x_modal").addClass("x")},a("a.modalAnchor").xeModalWindow()}),jQuery(function(a){var b=!1,c=27;a.fn.xeContentToggler=function(){return this.not(".xe-content-toggler").addClass("xe-content-toggler").each(function(){var c=a(this);$layer=a(c.attr("href")),$layer.hide().not(".xe-toggling-content").addClass("xe-toggling-content").mousedown(function(){b=!0}).focusout(function(){setTimeout(function(){b||$layer.find(":focus").length||"showing"!=$layer.data("state")||c.trigger("close.tc"),b=!1},1)})}).click(function(){var b,c=a(this);return b=a(c.attr("href")),b.data("anchor",c),c.trigger("showing"==b.data("state")?"close.tc":"open.tc"),!1}).bind("open.tc",function(){function d(){h.trigger("after-open.tc")}var e,f,g,h=a(this);switch(e=a(h.attr("href")),f=h.data("effect"),g=h.data("duration")||"fast",e.data("state","showing"),h.trigger("before-open.tc"),b=!1,a(document).unbind("mousedown.tc keydown.tc").bind("mousedown.tc keydown.tc",function(b){if(b){if("keydown"==b.type&&b.which!=c)return!0;if("mousedown"==b.type){var d=a(b.target);if(d.is("html,.tgAnchor,.tgContent")||e.has(d).length)return!0}}return h.trigger("close.tc"),!1}),f){case"slide":e.slideDown(g,d);break;case"slide-h":var i=e.css({"overflow-x":"",width:""}).width();e.show().css({"overflow-x":"hidden",width:"0px"}).animate({width:i},g,function(){e.css({"overflow-x":"",width:""}),d()});break;case"fade":e.fadeIn(g,d);break;default:e.show(),h.trigger("after-open.tc")}}).bind("close.tc",function(){function b(){f.trigger("after-close.tc")}var c,d,e,f=a(this);switch(a(document).unbind("mousedown.tc keydown.tc"),c=a(f.attr("href")),d=f.data("effect"),e=f.data("duration")||"fast",c.data("state","hiding"),f.trigger("before-close.tc"),d){case"slide":c.slideUp(e,b);break;case"slide-h":c.animate({width:0},e,function(){c.hide(),b()});break;case"fade":c.fadeOut(e,b);break;default:c.hide(),f.trigger("after-close.tc")}}),this},a("a.tgAnchor").xeContentToggler()}),jQuery(function(a){a.fn.xeModuleFinder=function(){return this.not(".xe-module-finder").addClass("xe-module-finder").find("a.tgAnchor.findsite").bind("before-open.tc",function(){function b(b){var e,f,g,h=b.site_list;if(d.empty(),c.closest(".modulefinder").find(".moduleList,.moduleIdList").attr("disabled","disabled"),b.error||!a.isArray(h))return void c.trigger("close.tc");for(f=0,g=h.length;g>f;f++)e=a("<li />").appendTo(d),a('<button type="button" />').text(h[f].domain).data("site_srl",h[f].site_srl).appendTo(e)}var c,d,e;c=a(this),d=a(c.attr("href")).find(">ul"),e=c.prev("input:text").val(),a.exec_json("admin.getSiteAllList",{domain:e},b)}).end().find(".tgContent.suggestion").delegate("button","click",function(){function b(b){var c,e,f=b.module_list;if(!b.error&&f){c=d.find(".moduleList").data("module_list",f).removeAttr("disabled").empty();for(e in f)f.hasOwnProperty(e)&&a("<option />").attr("value",e).text(f[e].title).appendTo(c);c.prop("selectedIndex",0).change().focus(),c.is(":visible")||c.slideDown(100,function(){d.find(".moduleIdList:not(:visible)").slideDown(100).trigger("show")}).trigger("show")}}var c,d;c=a(this),d=c.closest(".modulefinder"),d.find("a.tgAnchor.findsite").trigger("close.tc"),a.exec_json("module.procModuleAdminGetList",{site_srl:c.data("site_srl")},b)}).end().find(".moduleList,.moduleIdList").hide().end().find(".moduleList").change(function(){var b,c,d,e;if(b=a(this),d=b.val(),e=b.data("module_list"),e[d]){e=e[d].list,c=b.closest(".modulefinder").find(".moduleIdList").removeAttr("disabled").empty();for(var f in e)e.hasOwnProperty(f)&&a("<option />").attr("value",e[f].module_srl).text(e[f].browser_title).appendTo(c);c.prop("selectedIndex",0).change()}}),this},a(".modulefinder").xeModuleFinder()}),jQuery(function(a){var b=0;_xeModuleSearch=function(){var d=this,e=a(this),f=e.data("multiple");f||(f="");var g="__module_searcher_"+b;return b++,a.exec_json("module.getModuleAdminModuleSearcherHtml",{id:g,is_multiple:f},function(b){function f(a,b){var c;a.find("li div").width(""),a.css("height","auto"),a.css("overflow-y",""),a.height()>b&&(c=a.find("li div"),c.width(c.width()-20+"px"),a.css("height",b+"px"),a.css("overflow-y","auto"))}function h(b){var d,e=new RegExp(b,"ig"),g=j,h=function(a){return'<span class="highlight">'+a+"</span>"};for(o.empty(),i=0,c=g.length;c>i;i++){if(d=g[i].domain,b){if(!d.match(e))continue;d=d.replace(e,h)}$li=a("<li />").appendTo(o),a("<a>").attr("href","#").html(d).data("site_srl",g[i].site_srl).appendTo($li)}f(o,s-r.parent("div").height()),1==g.length&&o.find("a").trigger("click")}if(b&&b.html){e.after(b.html).addClass("tgAnchor").attr("href","#"+g).xeContentToggler();var j,k=e.next(".moduleWindow"),l=k.find(".siteList"),m=k.find(".moduleList"),n=k.find(".instanceList"),o=l.find(">ul"),p=m.find(">ul"),q=n.find(">select"),r=k.find("input.siteFinder"),s=280;r.keyup(function(){h(r.val())}),"undefined"==typeof console&&(console={log:function(){}}),e.not(".xe-module-search").addClass("xe-module-search").parent().find(".moduleTrigger").bind("before-open.tc",function(){function b(b){var d=b.site_list;return b.error||!a.isArray(d)?void c.trigger("close.tc"):(j=d,h(r.val()),void r.focus())}var c;c=a(this),o.empty(),q.empty(),m.hide(),n.hide(),a.exec_json("admin.getSiteAllList",{domain:""},b)}),k.find(".siteList>ul").delegate("a","click",function(b){function c(b){var c,e=b.module_list;if(!b.error&&e){for(c in e)e.hasOwnProperty(c)&&($li=a("<li />").appendTo(p),a("<a>").attr("href","#").html(e[c].title).data("moduleInstanceList",e[c].list).appendTo($li));k.find(".moduleList").show(),f(p,s),o.find("li").removeClass("x_active"),d.parent("li").addClass("x_active")}}var d,e;d=a(this),e=d.closest(".moduleSearch"),p.empty(),n.hide(),a.exec_json("module.procModuleAdminGetList",{site_srl:d.data("site_srl")},c),b.preventDefault()}).end().find(".moduleList>ul").delegate("a","click",function(b){var c,e;if(c=a(this),e=c.data("moduleInstanceList")){d.sSelectedModuleType=c.text(),q.empty();for(var g in e)e.hasOwnProperty(g)&&($li=a("<option />").html(e[g].browser_title+" ("+e[g].mid+")").appendTo(q).val(e[g].module_srl).data("mid",e[g].mid).data("module_srl",e[g].module_srl).data("layout_srl",e[g].layout_srl).data("browser_title",e[g].browser_title));n.show(),f(q,s),p.find("li").removeClass("x_active"),c.parent("li").addClass("x_active"),b.preventDefault()}}).end().find(".moduleSearch_ok").click(function(b){var c=[];q.find("option:selected").each(function(){c.push({type:d.sSelectedModuleType,module_srl:a(this).data("module_srl"),layout_srl:a(this).data("layout_srl"),browser_title:a(this).data("browser_title"),mid:a(this).data("mid")})}),e.trigger("moduleSelect",[c]),a(".moduleTrigger").trigger("close.tc"),b.preventDefault()})}}),this},a.fn.xeModuleSearch=function(){a(this).each(_xeModuleSearch)},a.fn.xeModuleSearchHtml=function(){var b=0;return a(this).each(function(){var c=a(this),d=c.attr("id");d||(d="__module_search_"+b),b++;var e=a('<a class="x_btn moduleTrigger">'+xe.cmd_find+"</a>"),f=a('<input type="text" readonly>');c.after(e).after("&nbsp;").after(f).hide(),e.xeModuleSearch(),e.bind("moduleSelect",function(a,b){f.val(b[0].browser_title+" ("+b[0].mid+")"),c.val(b[0].module_srl)}),c.val()&&a.exec_json("module.getModuleAdminModuleInfo",{search_module_srl:c.val()},function(a){a&&a.module_info&&f.val(a.module_info.browser_title+" ("+a.module_info.mid+")")})}),this}}),jQuery(function(a){var b=a.fn.hide;a.fn.hide=function(c,d,e,f){a(this).trigger("hide",[f]),a(this).find(".active").removeClass("active");var g=a(this).attr("id");return a(this).hasClass("col")&&(a(this).next().hide(c,d,e,f),g&&a(this).parent().find('a[href="#'+g+'"]').parent("li.active").removeClass("active")),b.apply(this,arguments)};var c=a.fn.show;a.fn.show=function(b,d,e,f){if(a(this).trigger("show",[f]),a(this).hasClass("col")){a(this).next().hide(b,d,e,f);var g=a(this).parent();setTimeout(function(){g.scrollTo(g.width(),0,{duration:0})},0)}var h=c.apply(this,arguments),i=a(this);return setTimeout(function(){i.trigger("after-show",[f])},0),h}}),jQuery(function(a){a.xeMsgBox={htOptions:{}};var b=a.xeMsgBox.$msgBox=a("<section />").addClass("x_modal _common x").hide().css("z-index",9999);b.html('<button type="button" class="x_close _cancel">&times;</button> <div class="x_modal-header"> <h1 class="_title"></h1> </div> <div class="x_modal-body"> <div class="_text"></div> </div> <div class="x_modal-footer"> <button type="button" class="x_btn x_pull-left _cancel">'+xe.cmd_cancel+'</button> <button type="submit" class="x_btn x_btn-inverse x_pull-right x_btn-primary _ok">'+xe.cmd_confirm+"</button> </div> "),a("body").append(b),b.find("._ok").click(function(){a.xeMsgBox.fnOnOK()}),b.find("._cancel").click(function(){a.xeMsgBox.fnOnCancel()}),b.bind("show",function(){a.xeMsgBox.bVisible=!0,a.xeMsgBox._showFoggy(),a.xeMsgBox.fnOnShow(),b.find("input,button").length>0&&setTimeout(function(){b.find("input,button").each(function(b,c){var d=a(c);return d.is(":visible")?(d.focus(),!1):void 0})},0)}),b.bind("hide",function(){a.xeMsgBox.bVisible=!1,a.xeMsgBox._hideFoggy(),a.xeMsgBox.fnOnHide()}),a(document.body).on("keydown",function(c){a.xeMsgBox.bVisible&&27===c.keyCode&&(b.find("._cancel").click(),c.preventDefault())}),a.xeMsgBox.fnOnOK=function(){"function"==typeof a.xeMsgBox.htOptions.fnOnOK&&a.xeMsgBox.htOptions.fnOnOK()||b.hide()},a.xeMsgBox.fnOnCancel=function(){"function"==typeof a.xeMsgBox.htOptions.fnOnCancel&&a.xeMsgBox.htOptions.fnOnCancel(),b.hide()},a.xeMsgBox.fnOnShow=function(){"function"==typeof a.xeMsgBox.htOptions.fnOnShow&&a.xeMsgBox.htOptions.fnOnShow()},a.xeMsgBox.fnOnHide=function(){"function"==typeof a.xeMsgBox.htOptions.fnOnHide&&a.xeMsgBox.htOptions.fnOnHide()},a.xeMsgBox.showMsgBox=function(c){a('head>link[rel="stylesheet"]:last').after('<link rel="stylesheet" href="./modules/menu/tpl/css/themes/default/style.css" />'),c=a.xeMsgBox.htOptions=c||{};var d=c.sTitle||"",e=c.sText||"",f=c.bDanger||!1;b.find("._title").html(d),b.find("._text").html(e),""===e?b.addClass("_nobody"):b.removeClass("_nobody");var g=b.find("._ok");f?(g.removeClass("x_btn-inverse"),g.addClass("x_btn-danger")):(g.removeClass("x_btn-danger"),g.addClass("x_btn-inverse")),c.bSmall?b.addClass("_small"):b.removeClass("_small"),c.bAlert?b.addClass("_type_alert"):b.removeClass("_type_alert"),b.show()},a.xeMsgBox.alertDialog=function(a){a=a||{},a.bAlert=!0,this.showMsgBox(a)},a.xeMsgBox.alert=function(a){htOptions={bAlert:!0,bNobody:!0,bSmall:!0,sText:a},this.showMsgBox(htOptions)},a.xeMsgBox.confirmDialog=function(a){a=a||{},a.bAlert=!1,this.showMsgBox(a)};var c=a.xeMsgBox.$foggyLayer=a("<div />");c.css({position:"fixed",top:0,left:0,backgroundColor:"#000",opacity:.5,display:"none",zIndex:9998}),a(a.find("body")).append(c),a.xeMsgBox._resizeFoggy=function(){c.css({width:0,height:0}),setTimeout(function(){c.css({width:a(document).width(),height:a(document).height()})},0)},a(window).resize(a.xeMsgBox._resizeFoggy),a.xeMsgBox._resizeFoggy(),a.xeMsgBox._showFoggy=function(){c.show()},a.xeMsgBox._hideFoggy=function(){c.hide()}}),jQuery(function(a){a.xeFoggy={};var b=a.xeFoggy.$foggyLayer=a("<div />");b.css({position:"fixed",top:0,left:0,backgroundColor:"#000",opacity:.5,display:"none",zIndex:9998}),a("body").append(b),a.xeFoggy._resizeFoggy=function(){b.css({width:0,height:0}),setTimeout(function(){b.css({width:a(document).width(),height:a(document).height()})},0)},a(window).resize(a.xeFoggy._resizeFoggy),a.xeFoggy._resizeFoggy(),a.xeFoggy.show=function(a){b.css(a?{opacity:0}:{opacity:.5}),b.show()},a.xeFoggy.hide=function(){b.hide()}}),jQuery(function(a){var b=!1,c=a('<tr class="placeholder"><td>&nbsp;</td></tr>');a.fn.xeSortableTable=function(){return this.not(".xe-sortable-table").addClass("xe-sortable-table").delegate("button.dragBtn","mousedown.st",function(d){var e,f,g,h,i,j,k,l,m,n,o,p;if(1==d.which){if(e=a(this),f=e.closest("tr"),g=e.closest("table"),p=g.get(0).offsetParent,i=f.height(),j=f.width(),before_event=a.Event("before-drag.st"),g.trigger(before_event),before_event.isDefaultPrevented())return!1;l={x:d.pageX,y:d.pageY},k=getOffset(f.get(0),p),$clone=f.attr("target",!0).clone(!0).appendTo(g),o=(h=g.find("thead th")).length,h.filter("[colspan]").attr("colspan",function(a,b){o+=b-1}),c.find("td").attr("colspan",o),m=[],g.find("tbody>tr:not([target],.sticky,:hidden)").each(function(){var b,c=a(this);b=getOffset(this,p),m.push({top:b.top,bottom:b.top+c.height(),$item:c})}),$clone.addClass("draggable").css({position:"absolute",opacity:.6,width:j,height:i,left:k.left,top:k.top,zIndex:100}),c.css({position:"absolute",opacity:.6,width:j,height:"10px",left:k.left,top:k.top,backgroundColor:"#bbb",overflow:"hidden",zIndex:99}).appendTo(g),f.css("opacity",.6),a(document).unbind("mousedown.st mouseup.st").bind("mousemove.st",function(a){var b,d,e,f,g;for(n=null,b={x:l.x-a.pageX,y:l.y-a.pageY},d=k.top-b.y,e=0,f=m.length;f>e;e++)g=m[e],e&&g.top>d||f-1>e&&g.bottom<d||(n={element:g.$item},g.top>d-12?(n.state="before",c.css("top",g.top-5)):(n.state="after",c.css("top",g.bottom-5)));$clone.css({top:d})}).bind("mouseup.st",function(){var d;b=!1,a(document).unbind("mousemove.st mouseup.st"),f.removeAttr("target").css("opacity",""),$clone.remove(),c.remove(),n&&(d=a(n.element),d[n.state](f),g.trigger("after-drag.st"))})}}),this},a("table.sortable").xeSortableTable()}),jQuery(function(a){a(".filebox").bind("before-open.mw",function(){function b(e){d.html(e.html),d.find(".select").bind("click",function(){var b=a("input.select_checkbox:checked");if(0===b.length){var d=a(this).closest("tr").find("img.filebox_item").attr("src");d?(c.trigger("filebox.selected",[d]),c.trigger("close.mw")):alert("None selected!")}else c.trigger("filebox.selected",[b]),c.trigger("close.mw");return!1}),d.find(".x_pagination").find("a").filter(function(){return a(this).data("toggle")?!1:a(this).parent().hasClass("x_disabled")?!1:a(this).parent().hasClass("x_active")?!1:!0}).bind("click",function(){var c=a(this).attr("page");return a.exec_json("module.getFileBoxListHtml",{page:c},b),!1}),a("#goToFileBox").find("button").bind("click",function(){var c=a(this).prev("input").val();return a.exec_json("module.getFileBoxListHtml",{page:c},b),!1}),d.closest(".x_modal-body").scrollTop(0)}var c,d,e;c=a(this),e=c.attr("href"),d=a(e).find(".filebox_list"),a.exec_json("module.getFileBoxListHtml",{page:"1"},b)});var b=a(".x .dsTg .__simple"),c=a(".x .dsTg .__detail"),d=a(".x .dsTg td.title");d.each(function(){var b=a(this);0===b.find("p.x_alert").length&&b.addClass("tg").find(">*:not(:first-child)").hide()});var e=a(".x .dsTg td.tg>*:not(:first-child)");b.click(function(){e.hide(),c.removeClass("x_active"),b.addClass("x_active")}),c.click(function(){e.show(),c.addClass("x_active"),b.removeClass("x_active")})}),jQuery(function(a){a.fn.xeMultilingualWindow=function(b){function c(){return o.is(":visible")&&q&&confirm(xe.msg_confirm_save_and_use_multilingual)&&o.find(".save-useit").trigger("click"),!0}function d(){if(p.is(":visible")&&p.find(".editMode").length){var a=p.find(".editMode");confirm(xe.msg_confirm_save_and_use_multilingual)?a.find(".save").trigger("click"):a.find(".cancel").trigger("click")}return!0}function e(){return p.find(".item > fieldset").hide().prev("a").children("i").removeClass("x_icon-chevrom-up").addClass("x_icon-chevron-down"),n.find('[href="#lang_create"]').trigger("click"),o.find(".editMode").children("textarea").val(""),q=!1,!0}function f(a){a?(i(1,xe.current_lang,"",a,!1),n.find('[href="#lang_search"]').trigger("click",!0)):i(1,xe.current_lang,"","",!1)}function g(){return c()&&d()&&e()?void 0:!1}function h(a,b){var c=n.data("lang-target");q=!1,c&&c.trigger("selected.g11n",[a,b])}function i(c,d,e,f,g){"undefined"==typeof c&&(c=1),"undefined"==typeof d&&(d=xe.current_lang),"undefined"==typeof e&&(e=""),"undefined"==typeof f&&(f=""),"undefined"==typeof g&&(g=!0),a.exec_json("module.getModuleAdminLangListHtml",{page:c,lang_code:d,search_keyword:e,name:f,list_count:b.list_count,mid:current_url.getQuery("mid")},function(b){b&&b.html&&(p.html(b.html),j(),k(),l(),m(),g&&(document.location.href="#lang_search"),f&&a("#lang_search").find('[href^="#lang-"]').trigger("click"))})}function j(){p.find(".x_pagination a").click(function(){var b=a(this).data("page"),c=a(this).data("search_keyword"),d=a(this).data("current_lang");return b?(i(b,d,c),!1):void 0}),p.find(".x_pagination").submit(function(){var b=a(this).find('[name="page"]').val(),c=a(this).data("search_keyword"),d=a(this).data("current_lang");return b?(i(b,d,c),!1):!1})}function k(){p.find(".search").submit(function(){var b=a(this).find('[name="search_keyword"]').val(),c=a(this).find('[name="lang_code"]').val();return i(1,c,b),!1}),p.find("#search_cancel").click(function(){i(1,xe.current_lang,"")})}function l(){p.find(".set").append('<i class="x_icon-chevron-down"></i>').click(function(){function b(b){var d=c.next("fieldset").find("textarea");d.each(function(){var c=a(this),d=b.langs[c.data("lang")],e=/^\$user_lang->/;e.test(d)?c.val("").data("value",""):c.val(d).data("value",d)}),c.data("is_loaded",!0)}var c=a(this),e=c.data("lang_code");d();var f="x_icon-chevron-up",g="x_icon-chevron-down";c.next("fieldset").is(":visible")?c.children("i").removeClass(f).addClass(g):(c.parent(".item").siblings(".item").find("a > i").removeClass(f).addClass(g).end().children("fieldset").hide(),c.children("i").removeClass(g).addClass(f)),"undefined"==typeof c.data("is_loaded")&&a.exec_json("module.getModuleAdminLangCode",{name:e,mid:current_url.getQuery("mid")},b)})}function m(){b.view_use||p.find(".useit").hide(),b.view_modify||p.find(".modify").hide(),b.view_delete||p.find(".delete").hide(),"save"==b.modify_type&&p.find(".save").text(xe.cmd_save),p.find(".modify").click(function(){a(this).closest("fieldset").addClass("editMode").find("textarea").removeAttr("disabled"),a(this).siblings(".cancel").prependTo(a(this).parent()),a(this).siblings(".delete").attr("disabled","disabled")}),p.find(".cancel").click(function(){return a(this).closest("fieldset").removeClass("editMode").find("textarea").attr("disabled","disabled").each(function(){var b=a(this);b.val(b.data("value"))}),a(this).siblings(".modify").prependTo(a(this).parent()),a(this).siblings(".delete").removeAttr("disabled"),!1}),p.find(".delete").click(function(){if(confirm(xe.confirm_delete)){var b=a(this);lang_name=b.closest(".item").find('[href^="#lang-"]').data("lang_code"),a.exec_json("module.procModuleAdminDeleteLang",{name:lang_name,mid:current_url.getQuery("mid")},function(a){if(a){if(a.error)return void alert(a.message);var b=p.find(".x_pagination"),c=b.data("page"),d=b.data("search_keyword"),e=b.data("lang_code");c||($page=1),i(c,e,d)}})}}),p.find(".item").submit(function(){var b=a(this),c=b.find(".editMode").children("textarea"),d=b.find('[href^="#lang-"]'),e={},f=null;return c.each(function(){var b=a(this);e[b.attr("class")]=b.val(),b.data("tmp_value",b.val()),xe.current_lang==b.attr("class")&&(f=b.val())}),e.lang_name=d.data("lang_code"),e.mid=current_url.getQuery("mid"),a.exec_json("module.procModuleAdminInsertLang",e,function(e){e&&!e.error&&e.name&&(c.each(function(){var b=a(this);b.data("value",b.data("tmp_value"))}),d.children("span").html(f),p.find(".cancel").trigger("click"),b.find(".useit").trigger("click"))}),!1}),p.find(".useit").click(function(){var b=a(this),c=b.closest(".item").find('[href^="#lang-"]'),d=c.data("lang_code"),e=c.children("span").text();h(d,e)})}var n=a(this),o=n.find("#lang_create"),p=n.find("#lang_search"),q=!1;return b=a.extend({create_type:"save_and_use",modify_type:"save_and_use",view_use:!0,view_modify:!0,view_delete:!1,list_count:5},b||{}),"save_and_use"!=b.create_type&&o.find(".save-useit").text(xe.cmd_save),n.find(".x_tabbable").xeTabbable(),o.find(".editMode textarea").change(function(){q=!0}),o.submit(function(){function c(a){a&&!a.error&&a.name&&("save_and_use"==b.create_type?h(a.name,g):(alert(a.message),e()))}var d=a(this),f={},g=null;return d.find(".editMode").children("textarea").each(function(){var b=a(this);f[b.attr("class")]=b.val(),xe.current_lang==b.attr("class")&&(g=b.val())}),g?(f.mid=current_url.getQuery("mid"),a.exec_json("module.procModuleAdminInsertLang",f,c),!1):(alert(xe.msg_empty_multilingual),!1)}),n.find('[href="#lang_search"]').click(function(a,b){"undefined"==typeof b&&i()}),n.bind("reset.g11n",function(){e()}),n.bind("before-open.g11n",function(a,b){f(b)}),n.bind("before-close.g11n",function(){return g()}),this}});var is_loaded_multilingual_window_html=!1;jQuery(function(a){a.fn.xeLoadMultilingualWindowHtml=function(){function b(b){var c=a("#content");a(b.html).appendTo(c).xeMultilingualWindow(),a(".lang_code").trigger("loaded-multilingualWindow")}return a.exec_json("module.getModuleAdminMultilingualHtml",{mid:current_url.getQuery("mid")},b),this}});var multilingual_id_count=0;jQuery(function(a){a.fn.xeApplyMultilingualUI=function(){return a(this).each(function(){function b(){function b(){g.val(l.val()).width(g.data("width")).removeAttr("disabled").data("active",!1),g.parent(".g11n").removeClass("active")}function f(){function c(a){if(a&&a.langs){var b=g.width();g.closest(".g11n").addClass("active"),g.val(a.langs[xe.current_lang]).attr("disabled","disabled").width(b-44).data("active",!0)}}b();var d=/^\$user_lang->/;d.test(g.val())&&a.exec_json("module.getModuleAdminLangCode",{name:g.val().replace("$user_lang->",""),mid:current_url.getQuery("mid")},c)}var g,h=a("#g11n"),i=c.width();g="TEXTAREA"==d.tagName||"textarea"==c.data("type")?a('<textarea id="lang_'+e+'" class="lang_code" style="width:'+i+'px" data-width="'+i+'">').data("lang-id",e):a('<input type="text" id="lang_'+e+'" class="lang_code" style="width:'+(i-28)+'px" data-width="'+(i-28)+'">').data("lang-id",e),g.attr("placeholder",c.attr("placeholder"));var j=a('<button type="button" class="x_add-on remover" title="'+xe.cmd_remove_multilingual_text+'"><i class="x_icon-remove"></i>'+xe.cmd_remove_multilingual_text+"</button>").data("lang-target",e),k=a('<a href="#g11n" class="x_add-on modalAnchor" title="'+xe.cmd_set_multilingual_text+'"><i class="x_icon-globe"></i>'+xe.cmd_set_multilingual_text+"</a>").data("lang-target",e);c.parent().addClass("g11n").addClass("x_input-append"),c.after(g,j,k),c.hide(),k.attr("href","#g11n").xeModalWindow(),g.bind("selected.g11n",function(a,b,c){var d=g.width();g.data("active")||(d-=44),g.width(d).attr("disabled","disabled").val(c).data("active",!0).parent(".g11n").addClass("active"),g.siblings("#"+g.data("lang-id")).val("$user_lang->"+b),k.trigger("close.mw")}),k.bind("open.mw",function(){a(this);g.data("active")?h.trigger("before-open.g11n",g.prev(".lang_code").val().replace("$user_lang->","")):h.trigger("before-open.g11n"),h.data("lang-target",g)}),k.bind("before-close.mw",function(){return h.trigger("before-close.g11n")}),j.click(function(){var b=a(this),c=a("#lang_"+b.data("lang-target"));if(c.data("active")){var d=c.width();c.val("").removeAttr("disabled").width(d+44).data("active",!1).parent(".g11n").removeClass("active"),b.siblings(".lang_code").val("")}});var l=c;g.bind("change keyup",function(){c=a(this),c.data("active")||l.val(c.val())}),c.bind("reload-multilingual",f),f()}is_loaded_multilingual_window_html||(a().xeLoadMultilingualWindowHtml(),is_loaded_multilingual_window_html=!0);var c=a(this),d=this;c.parent().hasClass("g11n")?c.siblings().remove():c.wrap("<span></span>");var e=c.attr("id");e||(e="__lang_code_"+multilingual_id_count,multilingual_id_count++,c.attr("id",e)),a("#g11n").length?b():c.bind("loaded-multilingualWindow",b)
 }),this},a('.vLang[type="hidden"]').each(function(){var b=a(this);b.next("textarea.vLang").length&&b.data("type","textarea"),b.removeClass("vLang").addClass("lang_code"),b.parent().find(".editUserLang").remove().end().find(".vLang").remove()}),a(".lang_code").xeApplyMultilingualUI()}),jQuery._xeAdminVar=jQuery._xeAdminVar||{},jQuery(function(a){function b(a){var b=jQuery,e=a.menuList,f=d(e,0,"menuSelector_menuTree","menuSelector_menuTreeNode");g.html(f),k=b.xeMenuSelectorVar.bMultiSelect;var h={plugins:["themes","html_data","ui","crrm"],crrm:{move:{check_move:function(a){var b=this._get_parent(a.o);return-1===b?!1:(b=this._get_parent(a.np),b?!0:!1)}}},core:{}};k||(h.ui={select_multiple_modifier:!1}),g.jstree(h).bind("loaded.jstree",function(a,d){d.inst.open_all();var e=b._xeAdminVar.sRenameOnload;b._xeAdminVar.sRenameOnload=null;var f=b._xeAdminVar.sSelectOnload;if(b._xeAdminVar.sSelectOnload=null,e&&(b("#siteMapTree").jstree("rename",b("#menu"+e)),b("#menu"+e)[0].scrollIntoView(!0)),f){var g=b("#menu"+f)[0];g&&(b("#siteMapTree").jstree("select_node",b(g)),g.scrollIntoView(!0))}b(this).find("A._menu_node").filter(function(a,d){var e=b(d);c(e)||e.css("opacity","0.2")})}).bind("select_node.jstree",function(){}).bind("before.jstree",function(a,d){return"select_node"!=d.func||($node=b(d.args[0]),c($node))?void 0:(a.stopImmediatePropagation(),!1)}),g.find("._nodeType_1, ._nodeType_3").parent("li").addClass("x_disabled")}function c(b){var c=a.parseJSON(b.attr("data-param"));return a.xeMenuSelectorVar.aAllowedType.length>0&&a.inArray(c.sType,a.xeMenuSelectorVar.aAllowedType)<0?!1:a.inArray(c.sType,a.xeMenuSelectorVar.aDisallowedType)>-1?!1:!0}function d(a,b,c,e){var f=jQuery;if(c=c||"menuSelector_menuTree",e=e||"menuSelector_menuTreeNode",0===a.length)return"";for(var g,h,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x="",y=0,z=a.length;z>y;y++){switch(a[y].sParentSrl=b,v="",u=a[y].menuSrl?1:2,q="",u){case 1:p=a[y].title,m=a[y].menuSrl,s=a[y].menuItems.list,w="#propertiesRoot",t="_ROOT";break;case 2:p=a[y].text,l=a[y].link,q=a[y].url,m=a[y].node_srl,k=a[y].expand,n=a[y].open_window,o=a[y].selected,g=a[y].active_btn,h=a[y].normal_btn,j=a[y].hover_btn,r=a[y].is_start_module,s=a[y].list,t=a[y].module_type,sModule=a[y].module,w="#properties","Y"===a[y].is_shortcut?(t="_SHORTCUT",q="",a[y].bShortCut=!0):a[y].bShortCut=!1}i[m]=a[y],i[m].aNode=s||[],i[m].nNodeType=u,i[m].sNodeSrl=m,i[m].sText=p,i[m].sMenuNameKey=i[m].menu_name_key,i[m].sModuleSrl=v=i[m].module_srl,i[m].sModuleType=t,sSubTree="",s&&s.length>0&&(sSubTree=d(s,m,c,e));var A=p;r&&(A+=" ${h}"),"_SHORTCUT"===i[m].sModuleType&&(A+=" ${s}",u=3);var B=f.tmpl(e,{MenuTitleWithHome:A,MenuTitle:p,MenuId:m,MenuUrl:q,NodeType:u,MenuType:t,SubTree:sSubTree,Target:w,ModuleSrl:v}).data("sMenuId",m).data("sMenuUrl",q).data("sMenuTitle",p).data("sMenuType",t);x+=B[0].outerHTML.replace("${h}","<i class='x_icon-home' title='Home Page'>[HOME]</i>").replace("${s}","<i class='x_icon-share' title='Shortcut'></i>")}return f.tmpl(c,{Nodes:x}).get()[0].outerHTML}function e(b){var c=a(b.target);a.xeMenuSelectorVar.bMultiSelect=""+c.data("multiple")=="true",a.xeMenuSelectorVar.aAllowedType=a.grep((""+(c.data("allowedType")||"")).split(","),function(a){return""!==a}),a.xeMenuSelectorVar.aDisallowedType=a.grep((""+(c.data("disallowedType")||"")).split(","),function(a){return""!==a}),a.xeMenuSelectorVar.aDisallowedType.push("_ROOT"),a.xeMenuSelectorVar.aDisallowedType.push("_SHORTCUT"),a.inArray("page",a.xeMenuSelectorVar.aAllowedType)>-1&&a.xeMenuSelectorVar.aAllowedType.push("ARTICLE","WIDGET","OUTSIDE"),a.inArray("page",a.xeMenuSelectorVar.aDisallowedType)>-1&&a.xeMenuSelectorVar.aDisallowedType.push("ARTICLE","WIDGET","OUTSIDE"),a.xeMenuSelectorVar.$container=a.xeMsgBox.$msgBox,a.xeMsgBox.confirmDialog({sTitle:xe.msg_select_menu,sText:'<select class="site_selector" style="width:100%;display:none"></select><div class="tree"></div>',bSmall:!0,bDanger:!0,fnOnOK:function(){var b=[];g.find(".jstree-clicked").each(function(){var c=a.parseJSON(a(this).attr("data-param"));b.push({browser_title:c.sMenuTitle,mid:c.sMenuUrl,module_srl:c.sModuleSrl,menu_id:c.sMenuId,type:c.sType})}),c.trigger("moduleSelect",[b])}}),a.exec_json("admin.getSiteAllList",{domain:""},f)}function f(b){var c=b.site_list;g=a.xeMenuSelectorVar.$container.find(".tree");var d=a.xeMenuSelectorVar.$container.find(".site_selector"),e=c.length;if(1>=e)d.hide();else{d.html("");for(var f=0;e>f;f++)d.append(a("<option>").val(c[f].site_srl).html(c[f].domain));d.show()}a.xeShowMenuSelector(g,"0")}var g,h,i,j,k;a.xeMenuSelectorVar={bMultiSelect:!1},a.template("menuSelector_menuTree","<ul>{{html Nodes}}</ul>"),a.template("menuSelector_menuTreeNode",'<li> <a href="#" class="_nodeType_${NodeType} _menu_node _menu_url_${MenuUrl}" data-param=\'{ "sMenuId":"${MenuId}", "sMenuUrl":"${MenuUrl}", "sMenuTitle":"${MenuTitle}", "sType":"${MenuType}", "sModuleSrl":"${ModuleSrl}" }\'>${MenuTitle}</a> {{html SubTree}} </li>'),a.xeShowMenuSelector=function(a,c,d,e){var f=jQuery,k={menu_srl:0,site_srl:c};g=a,h=e,j=d,i={},f.exec_json("menu.getMenuAdminSiteMap",k,b)},a.xeShowMenuSelectorIn=function(b){a.xeMenuSelectorVar.$container=b;var c=b;a.xeMenuSelectorVar.bMultiSelect=""+c.data("multiple")=="true",a.xeMenuSelectorVar.aAllowedType=a.grep((""+(c.data("allowedType")||"")).split(","),function(a){return""!==a}),a.xeMenuSelectorVar.aDisallowedType=a.grep((""+(c.data("disallowedType")||"")).split(","),function(a){return""!==a}),a.xeMenuSelectorVar.aDisallowedType.push("_ROOT"),a.xeMenuSelectorVar.aDisallowedType.push("_SHORTCUT"),b.not("._eventBound").addClass("_eventBound").on("change",".site_selector",function(){var c=a(this).val();a.xeShowMenuSelector(b.find(".tree"),c),b.trigger("site_changed")}),a.exec_json("admin.getSiteAllList",{domain:""},f)},a.fn.xeMenuSearchHtml=function(){var b=0;return a(this).each(function(){var c=a(this),d=c.attr("id");d||(d="__module_search_"+b),b++;var f=c.attr("data-multiple"),g=c.attr("data-allowedType"),h=c.attr("data-disallowedType"),i=a('<a class="x_btn moduleTrigger">'+xe.cmd_find+"</a>");i.data("multiple",f),i.data("allowedType",g),i.data("disallowedType",h);var j=a('<input type="text" readonly>');c.after(i).after("&nbsp;").after(j).hide(),i.data("multiple",a(this).data("multiple")),i.on("click",e),i.bind("moduleSelect",function(a,b){j.val(b[0].browser_title+" ("+b[0].mid+")"),c.val(b[0].module_srl)}),c.val()&&a.exec_json("module.getModuleAdminModuleInfo",{search_module_srl:c.val()},function(a){a&&a.module_info&&j.val(a.module_info.browser_title+" ("+a.module_info.mid+")")})}),this},$msgBox=a(".x_modal._common"),$msgBox.on("change",".site_selector",function(){var b=a(this).val();a.xeShowMenuSelector(g,b)}),a.fn.xeMenuSearch=function(){a(this).each(function(b,c){a(c).on("click",e)})},a(".module_search").xeMenuSearchHtml(),a(".moduleTrigger").xeMenuSearch()}),jQuery(function(a){try{window.alert=function(){return a.xeMsgBox.alert.apply(a.xeMsgBox,arguments)},setTimeout(function(){a("div.message.info").fadeOut(1e3)},2500)}catch(b){}}),jQuery(function(a){a("#site,.x_modal._common").on("keydown","input",function(b){var c,d;if(13===b.keyCode)for(c=a(b.target).parent();c&&!c.hasClass("col");){if(d=c.find("button.x_btn-primary,button.x_btn-inverse"),d.length>0){a(b.target).hasClass("lang_code")&&a(b.target).blur(),b.preventDefault(),d.click();break}c=c.parent()}})});
\ No newline at end of file
diff --git a/modules/editor/tpl/js/uploader.min.js b/modules/editor/tpl/js/uploader.min.js
index 7b0980a58..4a35f001d 100644
--- a/modules/editor/tpl/js/uploader.min.js
+++ b/modules/editor/tpl/js/uploader.min.js
@@ -1 +1 @@
-function previewFiles(a,b){var c,d,e,f,g,h,i=jQuery;if(!b){if(c=i(a.target).parent().andSelf().filter("select").find(">option:selected"),!c.length)return;b=c.attr("value")}b&&is_def(e=uploadedFiles[b])&&(d=i("#"+e.previewAreaID).html("&nbsp;"),d.length&&(f=e.download_url||"",g=f.match(/\.(?:(flv)|(swf)|(wmv|avi|mpe?g|as[fx]|mp3)|(jpe?g|png|gif))$/i),"Y"==e.direct_download&&g?g[1]?h='<embed src="'+request_uri+"common/img/flvplayer.swf?autoStart=false&file="+uploaded_filename+'" width="100%" height="100%" type="application/x-shockwave-flash" />':g[2]?h='<embed src="'+request_uri+f+'" width="100%" height="100%" type="application/x-shockwave-flash"  />':g[3]?h='<embed src="'+request_uri+f+'" width="100%" height="100%" autostart="true" showcontrols="0" />':g[4]&&(h='<img src="'+request_uri+f+'" border="0" width="100%" height="100%" />'):h='<img src="'+request_uri+'modules/editor/tpl/images/files.gif" border="0" width="100%" height="100%" />',h&&d.html(h)))}function removeUploadedFile(a){var b=uploaderSettings[a],c=b.fileListAreaID,d=get_by_id(c);if(d&&!(d.selectedIndex<0)){for(var e=[],f=0;f<d.options.length;f++)if(d.options[f].selected){var g=d.options[f].value;g&&(e[e.length]=g)}if(!(e.length<1)){var h={file_srls:e.join(","),editor_sequence:a};exec_xml("file","procFileDelete",h,function(){reloadFileList(b)})}}}function insertUploadedFile(a){var b=uploaderSettings[a],c=b.fileListAreaID,d=get_by_id(c);if(d){var e;if("preview"!=editorMode[a]){for(var f=[],g=0;g<d.options.length;g++)if(d.options[g].selected){var h=d.options[g].value;if(h){var i=uploadedFiles[h];editorFocus(a),"Y"==i.direct_download?/\.(jpg|jpeg|png|gif)$/i.test(i.download_url)?(loaded_images[h]?e=loaded_images[h]:(e=new Image,e.src=i.download_url),temp_code="",temp_code+='<img src="'+i.download_url+'" alt="'+i.source_filename+'"',e.complete===!0&&(temp_code+=' width="'+e.width+'" height="'+e.height+'"'),temp_code+=" />\r\n",f.push(temp_code)):f.push('<img src="common/img/blank.gif" editor_component="multimedia_link" multimedia_src="'+i.download_url+'" width="400" height="320" style="display:block;width:400px;height:320px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;" auto_start="false" alt="" />'):f.push('<a href="'+i.download_url+'">'+i.source_filename+"</a>\n")}}if("html"==editorMode[a])f.length>0&&get_by_id("editor_textarea_"+a)&&(get_by_id("editor_textarea_"+a).value+=f.join(""));else{var j=editorGetIFrame(a);if(!j)return;f.length>0&&editorReplaceHTML(j,f.join(""))}}}}var uploadedFiles=[],uploaderSettings=[],loaded_images=[],swfUploadObjs=[],uploadSettingObj=[],uploadAutosaveChecker=!1;!function(a){function b(b){var d=b.editorSequence;is_def(d)&&(b=a.extend({sessionName:"PHPSESSID",allowedFileSize:2097152,allowedFileTypes:"*.*",allowedFileTypesDescription:"All Files",replaceButtonID:"swfUploadButton"+b.editorSequence,insertedFiles:0},b),uploadSettingObj[d]=b,a(function(){c(b)}))}function c(b){var c,d,g,h,i,j,k,l,m,n,o,p;i=b.editorSequence,j=b.replaceButtonID,c=a("#"+j).wrap('<span style="position:relative;display:inline-block" />'),d=c.width(),g=c.height(),h=a('<span id="dummy'+j+'" />').insertAfter(c),k={flash_url:request_uri+"modules/editor/tpl/images/SWFUpload.swf",upload_url:request_uri.replace(/^https/i,"http")+"index.php",post_params:{mid:current_mid,act:"procFileUpload",editor_sequence:i,uploadTargetSrl:editorRelKeys[i].primary.value},http_success:[302],file_size_limit:Math.floor((parseInt(b.allowedFileSize,10)||1024)/1024),file_queue_limit:0,file_upload_limit:0,file_types:b.allowedFileTypes,file_types_description:b.allowedFileTypesDescription,custom_settings:{progressTarget:null,cancelButtonId:null},debug:!1,button_window_mode:"transparent",button_placeholder_id:h.attr("id"),button_text:null,button_image_url:request_uri+"common/img/blank.gif",button_width:d,button_height:g,button_text_style:null,button_text_left_padding:0,button_text_top_padding:0,button_cursor:-2,editorSequence:i,uploadTargetSrl:editorRelKeys[i].primary.value,fileListAreaID:b.fileListAreaID,previewAreaID:b.previewAreaID,uploaderStatusID:b.uploaderStatusID},"undefined"!=typeof enforce_ssl&&enforce_ssl&&(k.upload_url=request_uri+"index.php"),a("#"+b.fileListAreaID).click(previewFiles),l={file_queued:"FileQueued",file_queue_error:"FileQueueError",file_dialog_complete:"FileDialogComplete",upload_start:"UploadStart",upload_progress:"UploadProgress",upload_error:"UploadError",upload_success:"UploadSuccess",upload_complete:"UploadComplete",queue_complete:"QueueComplete"};for(m in l)l.hasOwnProperty(m)&&(n="on"+l[m],k[m+"_handler"]=b["on"+n]||f[n]);is_def(window.xeVid)&&(k.post_params.vid=xeVid),k.post_params[b.sessionName]=getCookie(b.sessionName),uploaderSettings[i]=k,o=new SWFUpload(k),p=a("#"+o.movieName),swfUploadObjs[i]=o.movieName,p.length&&(p.css({display:"block",cursor:"pointer",position:"absolute",left:0,top:0,width:d+"px",height:g+"px"}),(b.insertedFiles||editorRelKeys[i].primary.value)&&e(b))}function d(){return!0}function e(b){function c(){"function"==typeof _editorAutoSave&&(uploadAutosaveChecker=!0,_editorAutoSave(!0))}function d(d){var e,f,g,h,i,j,k,l,m,n,o;if(f=d.editor_sequence,g=d.files,i=d.upload_status,h=d.upload_target_srl,j=Math.floor((parseInt(d.left_size,10)||0)/1024),e=a("#"+b.fileListAreaID).empty(),h&&(editorRelKeys[f].primary.value!=h&&(editorRelKeys[f].primary.value=h,c()),editorRelKeys[f].primary.value=h,b.uploadTargetSrl=h),a("#"+b.uploaderStatusID).html(i),a("#"+b.previewAreaID).empty(),g&&g.item){for(k=g.item,a.isArray(k)||(k=[k]),l=0,m=k.length;m>l;l++)n=k[l],o=n.file_srl,uploadedFiles[o]=n,n.previewAreaID=b.previewAreaID,/\.(jpe?g|png|gif)$/i.test(n.download_url)&&(loaded_images[o]=a("<img />").attr("src",n.download_url).get(0)),a("<option />").text(n.source_filename+" ("+n.disp_file_size+" )").attr("value",o).appendTo(e);l&&e.prop("selectedIndex",l-1).click()}uploadAutosaveChecker||c()}var e={mid:current_mid,file_list_area_id:b.fileListAreaID,editor_sequence:b.editorSequence,upload_target_srl:b.uploadTargetSrl};exec_xml("file","getFileList",e,d,"error,message,files,upload_status,upload_target_srl,editor_sequence,left_size".split(","))}var f;f={onFileQueued:d,onFileQueueError:function(a,b,c){try{switch(b){case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:alert("You have attempted to queue too many files.\n"+(0===c?"You have reached the upload limit.":"You may select "+(c>1?"up to "+c+" files.":"one file.")));break;case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:alert("Error Code: File too big, File name: "+a.name+", File size: "+a.size+", Message: "+c);break;case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:alert("Error Code: Zero byte file, File name: "+a.name+", File size: "+a.size+", Message: "+c);break;case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:alert("Error Code: Invalid File Type, File name: "+a.name+", File size: "+a.size+", Message: "+c);break;default:alert("Error Code: "+b+", File name: "+a.name+", File size: "+a.size+", Message: "+c)}}catch(d){this.debug(d)}},onFileDialogComplete:function(){try{this.startUpload()}catch(a){this.debug(a)}},onUploadStart:d,onUploadProgress:function(b,c,d){try{var e,f,g,h;e=a("#"+this.settings.fileListAreaID),g=Math.ceil(c/d*100),h=b.name,f=e.find(">option:last"),h.length>20&&(h=h.substr(0,20)+"..."),f.length&&f.attr("value")==b.id||(f=a("<option />").attr("value",b.id).appendTo(e)),f.text(h+" ("+g+"%)")}catch(i){this.debug(i)}},onUploadSuccess:function(){try{0!==this.getStats().files_queued&&this.startUpload()}catch(a){this.debug(a)}},onUploadError:function(a,b,c){try{switch(b){case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:alert("Error Code: HTTP Error, File name: "+a.name+", Message: "+c);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:alert("Error Code: Upload Failed, File name: "+a.name+", File size: "+a.size+", Message: "+c);break;case SWFUpload.UPLOAD_ERROR.IO_ERROR:alert("Error Code: IO Error, File name: "+a.name+", Message: "+c);break;case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:alert("Error Code: Security Error, File name: "+a.name+", Message: "+c);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:alert("Error Code: Upload Limit Exceeded, File name: "+a.name+", File size: "+a.size+", Message: "+c);break;case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:alert("Error Code: File Validation Failed, File name: "+a.name+", File size: "+a.size+", Message: "+c);break;case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:0===this.getStats().files_queued&&(document.getElementById(this.customSettings.cancelButtonId).disabled=!0);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:break;default:alert("Error Code: "+b+", File name: "+a.name+", File size: "+a.size+", Message: "+c)}}catch(d){this.debug(d)}},onUploadComplete:function(){try{{this.settings.fileListAreaID,this.settings.uploadTargetSrl}e(this.settings)}catch(a){this.debug(ex)}}},window.editorUploadInit=b,window.reloadFileList=e,a(function(){try{document.execCommand("BackgroundImageCache",!1,!0)}catch(a){}})}(jQuery);
\ No newline at end of file
+function previewFiles(a,b){var c,d,e,f,g,h,i=jQuery;if(!b){if(c=i(a.target).parent().andSelf().filter("select").find(">option:selected"),!c.length)return;b=c.attr("value")}b&&is_def(e=uploadedFiles[b])&&(d=i("#"+e.previewAreaID).html("&nbsp;"),d.length&&(f=e.download_url||"",g=f.match(/\.(?:(flv)|(swf)|(wmv|avi|mpe?g|as[fx]|mp3)|(jpe?g|png|gif))$/i),"Y"==e.direct_download&&g?g[1]?h='<embed src="'+request_uri+"common/img/flvplayer.swf?autoStart=false&file="+uploaded_filename+'" width="100%" height="100%" type="application/x-shockwave-flash" />':g[2]?h='<embed src="'+request_uri+f+'" width="100%" height="100%" type="application/x-shockwave-flash"  />':g[3]?h='<embed src="'+request_uri+f+'" width="100%" height="100%" autostart="true" showcontrols="0" />':g[4]&&(h='<img src="'+request_uri+f+'" border="0" width="100%" height="100%" />'):h='<img src="'+request_uri+'modules/editor/tpl/images/files.gif" border="0" width="100%" height="100%" />',h&&d.html(h)))}function removeUploadedFile(a){var b=uploaderSettings[a],c=b.fileListAreaID,d=get_by_id(c);if(d&&!(d.selectedIndex<0)){for(var e=[],f=0;f<d.options.length;f++)if(d.options[f].selected){var g=d.options[f].value;g&&(e[e.length]=g)}if(!(e.length<1)){var h={file_srls:e.join(","),editor_sequence:a};exec_xml("file","procFileDelete",h,function(){reloadFileList(b)})}}}function insertUploadedFile(a){var b=uploaderSettings[a],c=b.fileListAreaID,d=get_by_id(c);if(d){var e;if("preview"!=editorMode[a]){for(var f=[],g=0;g<d.options.length;g++)if(d.options[g].selected){var h=d.options[g].value;if(h){var i=uploadedFiles[h];editorFocus(a),"Y"==i.direct_download?/\.(jpg|jpeg|png|gif)$/i.test(i.download_url)?(loaded_images[h]?e=loaded_images[h]:(e=new Image,e.src=i.download_url),temp_code="",temp_code+='<img src="'+i.download_url+'" alt="'+i.source_filename+'"',e.complete===!0&&(temp_code+=' width="'+e.width+'" height="'+e.height+'"'),temp_code+=" />\r\n<p><br /></p>\r\n",f.push(temp_code)):f.push('<img src="common/img/blank.gif" editor_component="multimedia_link" multimedia_src="'+i.download_url+'" width="400" height="320" style="display:block;width:400px;height:320px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;" auto_start="false" alt="" />'):f.push('<a href="'+i.download_url+'">'+i.source_filename+"</a>\n")}}if("html"==editorMode[a])f.length>0&&get_by_id("editor_textarea_"+a)&&(get_by_id("editor_textarea_"+a).value+=f.join(""));else{var j=editorGetIFrame(a);if(!j)return;f.length>0&&editorReplaceHTML(j,f.join(""))}}}}var uploadedFiles=[],uploaderSettings=[],loaded_images=[],swfUploadObjs=[],uploadSettingObj=[],uploadAutosaveChecker=!1;!function(a){function b(b){var d=b.editorSequence;is_def(d)&&(b=a.extend({sessionName:"PHPSESSID",allowedFileSize:2097152,allowedFileTypes:"*.*",allowedFileTypesDescription:"All Files",replaceButtonID:"swfUploadButton"+b.editorSequence,insertedFiles:0},b),uploadSettingObj[d]=b,a(function(){c(b)}))}function c(b){var c,d,g,h,i,j,k,l,m,n,o,p;i=b.editorSequence,j=b.replaceButtonID,c=a("#"+j).wrap('<span style="position:relative;display:inline-block" />'),d=c.width(),g=c.height(),h=a('<span id="dummy'+j+'" />').insertAfter(c),k={flash_url:request_uri+"modules/editor/tpl/images/SWFUpload.swf",upload_url:request_uri.replace(/^https/i,"http")+"index.php",post_params:{mid:current_mid,act:"procFileUpload",editor_sequence:i,uploadTargetSrl:editorRelKeys[i].primary.value},http_success:[302],file_size_limit:Math.floor((parseInt(b.allowedFileSize,10)||1024)/1024),file_queue_limit:0,file_upload_limit:0,file_types:b.allowedFileTypes,file_types_description:b.allowedFileTypesDescription,custom_settings:{progressTarget:null,cancelButtonId:null},debug:!1,button_window_mode:"transparent",button_placeholder_id:h.attr("id"),button_text:null,button_image_url:request_uri+"common/img/blank.gif",button_width:d,button_height:g,button_text_style:null,button_text_left_padding:0,button_text_top_padding:0,button_cursor:-2,editorSequence:i,uploadTargetSrl:editorRelKeys[i].primary.value,fileListAreaID:b.fileListAreaID,previewAreaID:b.previewAreaID,uploaderStatusID:b.uploaderStatusID},"undefined"!=typeof enforce_ssl&&enforce_ssl&&(k.upload_url=request_uri+"index.php"),a("#"+b.fileListAreaID).click(previewFiles),l={file_queued:"FileQueued",file_queue_error:"FileQueueError",file_dialog_complete:"FileDialogComplete",upload_start:"UploadStart",upload_progress:"UploadProgress",upload_error:"UploadError",upload_success:"UploadSuccess",upload_complete:"UploadComplete",queue_complete:"QueueComplete"};for(m in l)l.hasOwnProperty(m)&&(n="on"+l[m],k[m+"_handler"]=b["on"+n]||f[n]);is_def(window.xeVid)&&(k.post_params.vid=xeVid),k.post_params[b.sessionName]=getCookie(b.sessionName),uploaderSettings[i]=k,o=new SWFUpload(k),p=a("#"+o.movieName),swfUploadObjs[i]=o.movieName,p.length&&(p.css({display:"block",cursor:"pointer",position:"absolute",left:0,top:0,width:d+"px",height:g+"px"}),(b.insertedFiles||editorRelKeys[i].primary.value)&&e(b))}function d(){return!0}function e(b){function c(){"function"==typeof _editorAutoSave&&(uploadAutosaveChecker=!0,_editorAutoSave(!0))}function d(d){var e,f,g,h,i,j,k,l,m,n,o;if(f=d.editor_sequence,g=d.files,i=d.upload_status,h=d.upload_target_srl,j=Math.floor((parseInt(d.left_size,10)||0)/1024),e=a("#"+b.fileListAreaID).empty(),h&&(editorRelKeys[f].primary.value!=h&&(editorRelKeys[f].primary.value=h,c()),editorRelKeys[f].primary.value=h,b.uploadTargetSrl=h),a("#"+b.uploaderStatusID).html(i),a("#"+b.previewAreaID).empty(),g&&g.item){for(k=g.item,a.isArray(k)||(k=[k]),l=0,m=k.length;m>l;l++)n=k[l],o=n.file_srl,uploadedFiles[o]=n,n.previewAreaID=b.previewAreaID,/\.(jpe?g|png|gif)$/i.test(n.download_url)&&(loaded_images[o]=a("<img />").attr("src",n.download_url).get(0)),a("<option />").text(n.source_filename+" ("+n.disp_file_size+" )").attr("value",o).appendTo(e);l&&e.prop("selectedIndex",l-1).click()}uploadAutosaveChecker||c()}var e={mid:current_mid,file_list_area_id:b.fileListAreaID,editor_sequence:b.editorSequence,upload_target_srl:b.uploadTargetSrl};exec_xml("file","getFileList",e,d,"error,message,files,upload_status,upload_target_srl,editor_sequence,left_size".split(","))}var f;f={onFileQueued:d,onFileQueueError:function(a,b,c){try{switch(b){case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:alert("You have attempted to queue too many files.\n"+(0===c?"You have reached the upload limit.":"You may select "+(c>1?"up to "+c+" files.":"one file.")));break;case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:alert("Error Code: File too big, File name: "+a.name+", File size: "+a.size+", Message: "+c);break;case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:alert("Error Code: Zero byte file, File name: "+a.name+", File size: "+a.size+", Message: "+c);break;case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:alert("Error Code: Invalid File Type, File name: "+a.name+", File size: "+a.size+", Message: "+c);break;default:alert("Error Code: "+b+", File name: "+a.name+", File size: "+a.size+", Message: "+c)}}catch(d){this.debug(d)}},onFileDialogComplete:function(){try{this.startUpload()}catch(a){this.debug(a)}},onUploadStart:d,onUploadProgress:function(b,c,d){try{var e,f,g,h;e=a("#"+this.settings.fileListAreaID),g=Math.ceil(c/d*100),h=b.name,f=e.find(">option:last"),h.length>20&&(h=h.substr(0,20)+"..."),f.length&&f.attr("value")==b.id||(f=a("<option />").attr("value",b.id).appendTo(e)),f.text(h+" ("+g+"%)")}catch(i){this.debug(i)}},onUploadSuccess:function(){try{0!==this.getStats().files_queued&&this.startUpload()}catch(a){this.debug(a)}},onUploadError:function(a,b,c){try{switch(b){case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:alert("Error Code: HTTP Error, File name: "+a.name+", Message: "+c);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:alert("Error Code: Upload Failed, File name: "+a.name+", File size: "+a.size+", Message: "+c);break;case SWFUpload.UPLOAD_ERROR.IO_ERROR:alert("Error Code: IO Error, File name: "+a.name+", Message: "+c);break;case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:alert("Error Code: Security Error, File name: "+a.name+", Message: "+c);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:alert("Error Code: Upload Limit Exceeded, File name: "+a.name+", File size: "+a.size+", Message: "+c);break;case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:alert("Error Code: File Validation Failed, File name: "+a.name+", File size: "+a.size+", Message: "+c);break;case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:0===this.getStats().files_queued&&(document.getElementById(this.customSettings.cancelButtonId).disabled=!0);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:break;default:alert("Error Code: "+b+", File name: "+a.name+", File size: "+a.size+", Message: "+c)}}catch(d){this.debug(d)}},onUploadComplete:function(){try{{this.settings.fileListAreaID,this.settings.uploadTargetSrl}e(this.settings)}catch(a){this.debug(ex)}}},window.editorUploadInit=b,window.reloadFileList=e,a(function(){try{document.execCommand("BackgroundImageCache",!1,!0)}catch(a){}})}(jQuery);
\ No newline at end of file
diff --git a/modules/widget/tpl/js/widget.min.js b/modules/widget/tpl/js/widget.min.js
index 8fb632e5c..ac05495fd 100644
--- a/modules/widget/tpl/js/widget.min.js
+++ b/modules/widget/tpl/js/widget.min.js
@@ -1 +1 @@
-function getStyle(a){var b=a.getAttribute("style");return b||(b=a.style),"object"==typeof b&&(b=b.cssText),b=b.replace(/\burl\s*\(\s*"(.*?)"\s*\)/i,"url('$1')")}function getFloat(a){return jQuery(a).css("float")}function setFloat(a,b){jQuery(a).css("float",b)}function getPadding(a,b){var c=a.getAttribute("widget_padding_"+b);return c&&null!==c||(c=0),c}function doStartPageModify(a,b){zonePageObj=get_by_id(a),zoneModuleSrl=b,jQuery("#tmpPageSizeLayer").appendTo("body").hide().attr("id","pageSizeLayer").css({position:"fixed"}).before('<div class="x_modal-backdrop" />').find(">form").submit(function(){return doApplyWidgetSize(this),!1}),jQuery("#zonePageContent").on("click",doCheckWidget).on("mousedown",doCheckWidgetDrag).on("mouseover",widgetSetup)}function removeAllWidget(){confirm(confirm_delete_msg)&&(restoreWidgetButtons(),jQuery(zonePageObj).html(""))}function getWidgetContent(a){var b="";"undefined"!=typeof a&&a||(a=zonePageObj);var c=null;return jQuery("div.widgetOutput",a).each(function(){if(jQuery(this).parent().get(0)==a)switch(c=jQuery(this).attr("widget")){case"widgetBox":b+=getWidgetBoxCode(this,c);break;case"widgetContent":b+=getContentWidgetCode(this,c);break;default:b+=getWidgetCode(this,c)}}),b}function getContentWidgetCode(a){var b,c=(a.firstChild,jQuery("div.widgetContent",a)),d="",e="",f=0,g="contenteditable,id,style,src,widget,body,class,widget_width,widget_width_type,xdpx,xdpy,height,document_srl,widget_padding_left,widget_padding_right,widget_padding_top,widget_padding_bottom,hascontent";if(c.size()>0){f=jQuery(a).attr("document_srl"),d=f>0?"":c.html();for(var h,i=new RegExp("^("+g.replace(/,/g,"|")+")$","i"),j=0;j<a.attributes.length;j++)(b=a.attributes[j].nodeName)&&a.attributes[j].nodeValue&&(i.test(b)||(h=a.attributes[j].nodeValue)&&(e+=b+'="'+encodeURIComponent(h)+'" '));return'<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="'+getStyle(a)+'" body="'+d+'" document_srl="'+f+'" widget_padding_left="'+getPadding(a,"left")+'" widget_padding_right="'+getPadding(a,"right")+'" widget_padding_top="'+getPadding(a,"top")+'" widget_padding_bottom="'+getPadding(a,"bottom")+'" '+e+" />"}return""}function getWidgetBoxCode(a){for(var b="",c=0;c<a.attributes.length;c++)if(a.attributes[c].nodeName&&a.attributes[c].nodeValue&&!/^jquery[0-9]+/i.test(a.attributes[c].nodeName)){var d=a.attributes[c].nodeName.toLowerCase();if("widget_padding_left"!=d&&"widget_padding_right"!=d&&"widget_padding_top"!=d&&"widget_padding_bottom"!=d&&"contenteditable"!=d&&"id"!=d&&"style"!=d&&"src"!=d&&"widget"!=d&&"body"!=d&&"class"!=d&&"widget_width"!=d&&"widget_width_type"!=d&&"xdpx"!=d&&"xdpy"!=d&&"height"!=d){var e=a.attributes[c].nodeValue;e&&"Array"!=e&&(b+=d+'="'+encodeURIComponent(e)+'" ')}}var f;jQuery(".widget_inner",a).size()>0?(f=jQuery(".widget_inner",a),f=f.get(0)):f=jQuery(".nullWidget",a).get(0);var g=getWidgetContent(f);return'<div widget="widgetBox" style="'+getStyle(a)+'" widget_padding_left="'+getPadding(a,"left")+'" widget_padding_right="'+getPadding(a,"right")+'" widget_padding_top="'+getPadding(a,"top")+'" widget_padding_bottom="'+getPadding(a,"bottom")+'" '+b+"><div><div>"+g+"</div></div></div>"}function getWidgetCode(a,b){for(var c="",d=0;d<a.attributes.length;d++)if(a.attributes[d].nodeName&&a.attributes[d].nodeValue&&!/^jquery[0-9]+/i.test(a.attributes[d].nodeName)){var e=a.attributes[d].nodeName.toLowerCase();if("contenteditable"!=e&&"id"!=e&&"style"!=e&&"src"!=e&&"widget"!=e&&"body"!=e&&"class"!=e&&"widget_width"!=e&&"widget_width_type"!=e&&"xdpx"!=e&&"xdpy"!=e&&"height"!=e){var f=a.attributes[d].nodeValue;f&&"Array"!=f&&"null"!=f&&(c+=e+'="'+encodeURIComponent(f)+'" ')}}a.getAttribute("style");return'<img class="zbxe_widget_output" style="'+getStyle(a)+'" widget="'+b+'" '+c+" />"}function doAddContent(a){var b=request_uri.setQuery("module","widget").setQuery("act","dispWidgetAdminAddContent").setQuery("module_srl",zoneModuleSrl).setQuery("mid",a);popopen(b,"addContent")}function doSyncPageContent(){if(opener&&opener.selectedWidget){var a=get_by_id("content_fo"),b=opener.selectedWidget;a.style.value=getStyle(opener.selectedWidget),a.widget_padding_left.value=getPadding(b,"left"),a.widget_padding_right.value=getPadding(b,"right"),a.widget_padding_bottom.value=getPadding(b,"bottom"),a.widget_padding_top.value=getPadding(b,"top");for(var c=b.firstChild;c&&!jQuery(c).hasClass("widgetContent");)c=c.nextSibling;if(c&&jQuery(c).hasClass("widgetContent")&&(!a.document_srl||"0"==a.document_srl.value))try{var d=Base64.decode(xInnerHtml(c));d=editorReplacePath(d),get_by_id("content_fo").content.value=d,xe.Editors[1].exec("SET_IR",[d])}catch(e){}}"undefined"!=typeof editorStart&&editorStart(1,"module_srl","content",!1,400)}function addContentWidget(a){var b=a.getAttribute("editor_sequence"),c=(a.mid.value,a.module_srl.value),d=a.document_srl.value,e=editorGetContent(b),f={editor_sequence:b,content:e,module_srl:c,document_srl:d};if(/^\s*<p>.*<\/p>\s*$/i.test(f.content)){var g=f.content.toLowerCase(),h=g.indexOf("</p>"),i=g.lastIndexOf("</p>");h>0&&i>0&&h==i&&(f.content=e=f.content.replace(/^\s*<p>|<\/p>\s*$/gi,""))}return exec_xml("widget","procWidgetInsertDocument",f,function(b){if(b&&"0"==b.error){var c=b.document_srl,d=opener.jQuery("div.widgetOutput[widget=widgetContent][document_srl="+c+"]"),f=[];d.size()>0&&(f=d.get(0).attributes);for(var g='<div class="widgetOutput" style="'+a.style.value+'" widget_padding_left="'+a.widget_padding_left.value+'" widget_padding_right="'+a.widget_padding_right.value+'" widget_padding_top="'+a.widget_padding_top.value+'" widget_padding_bottom="'+a.widget_padding_bottom.value+'" document_srl="'+c+'" widget="widgetContent"><button type="button" class="widgetResize"></button><button type="button" class="widgetResizeLeft"></button><div class="widgetBorder"><div style="padding:'+a.widget_padding_top.value+"px "+a.widget_padding_right.value+"px "+a.widget_padding_bottom.value+"px "+a.widget_padding_left.value+'px"></div>'+e+'</div><div class="widgetContent" style="display:none;width:1px;height:1px;overflow:hidden;"></div></div>',h=jQuery(g),i=0,j=f.length;j>i;i++)h.attr(f[i].name)||h.attr(f[i].name,f[i].value);g=jQuery("<div>").append(h).html(),opener.doAddWidgetCode(g),window.close()}},"document_srl".split(",")),!1}function doAddWidgetBox(){var a='<div class="widgetOutput" style="float:left;width:100%;height:20px;" widget="widgetBox" ><button type="button" class="widgetBoxResize"></button><button type="button" class="widgetBoxResizeLeft"></button><div class="widgetBoxBorder"><div class="nullWidget" style="width:100%;height:100px;"></div></div></div>';zonePageObj.innerHTML+=a}function doAddWidget(a){var b=a.widget_list,c=b.selectedIndex,d=b.options[c].value,e=a.module_srl.value,f=request_uri.setQuery("module","widget").setQuery("act","dispWidgetGenerateCodeInPage").setQuery("selected_widget",d).setQuery("module_srl",e);popopen(f,"GenerateWidgetCode")}function doAddWidgetCode(widget_code){restoreWidgetButtons();for(var tmp=widget_code;tmp.indexOf("<!--#Meta:")>-1;){var pos=tmp.indexOf("<!--#Meta:");tmp=tmp.substr(pos);var eos=tmp.indexOf("-->"),cssfile=tmp.substr(10,eos-10);if(cssfile.indexOf(".js")>-1)tmp=tmp.substr(eos);else{if(!cssfile)break;if(tmp=tmp.substr(eos),cssfile=request_uri+cssfile,"undefined"==typeof document.createStyleSheet){var css='<link rel="stylesheet" href="'+cssfile+'" />',dummy=xCreateElement("DIV");xInnerHtml(dummy,css),document.body.appendChild(dummy)}else document.createStyleSheet(cssfile,0)}}for(checkDocumentWrite=!0,tmp=widget_code.toLowerCase();tmp.indexOf("<script")>-1;){var pos=tmp.indexOf("<script");tmp=tmp.substr(pos);var length=tmp.indexOf("</script>")+9,script=widget_code.substr(pos,length);script=script.replace(/^<script([^>]*)>/i,"").replace(/<\/script>$/i,""),writedText=null;try{eval(script)}catch(e){}widget_code=widget_code.substr(0,pos)+writedText+widget_code.substr(pos+length),tmp=widget_code.toLowerCase()}var dummy=xCreateElement("div");xInnerHtml(dummy,widget_code);var obj=dummy.childNodes[0];if(selectedWidget&&selectedWidget.getAttribute("widget")){var o=jQuery("div.widget_inner",selectedWidget),n=jQuery("div.widget_inner",obj);0===n.size()&&(n=jQuery("div.nullWidget",obj)),0===o.size()&&(o=jQuery("div.nullWidget",selectedWidget)),n.html(o.html()),selectedWidget.parentNode.insertBefore(obj,selectedWidget),selectedWidget.parentNode.removeChild(selectedWidget)}else get_by_id("zonePageContent").appendChild(obj);checkDocumentWrite=!1,selectedWidget=null}function doCheckWidget(a){if(a.target){var b=a.target,c=jQuery(b);if(selectedWidget=null,doHideWidgetSizeSetup(),c.hasClass("widgetSetup")){var d=b.parentNode.parentNode,e=d.getAttribute("widget");if(!e)return;return selectedWidget=d,void("widgetContent"==e?popopen(request_uri+"?module=widget&act=dispWidgetAdminAddContent&module_srl="+zoneModuleSrl+"&document_srl="+d.getAttribute("document_srl"),"addContent"):popopen(request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+e+"&widgetstyle="+f,"GenerateCodeInPage"))}if(c.hasClass("widgetStyle")){var d=b.parentNode.parentNode,e=d.getAttribute("widget"),f=d.getAttribute("widgetstyle");if(!e)return;return selectedWidget=d,void popopen(request_uri+"?module=widget&act=dispWidgetStyleGenerateCodeInPage&selected_widget="+e+"&widgetstyle="+f,"GenerateCodeInPage")}if(c.hasClass("widgetCopy")&&jQuery(b.parentNode.parentNode).hasClass("widgetOutput")){var d=b.parentNode.parentNode;if(restoreWidgetButtons(),"widgetContent"==d.getAttribute("widget")&&d.getAttribute("document_srl")){var g=["error","message","document_srl"],h=[];return h.document_srl=d.getAttribute("document_srl"),void exec_xml("widget","procWidgetCopyDocument",h,completeCopyWidgetContent,g,h,d)}var i=xCreateElement("DIV");xInnerHtml(i,xInnerHtml(d)),i.widget_sequence="",i.className="widgetOutput";for(var j=0;j<d.attributes.length;j++)if(d.attributes[j].nodeName&&d.attributes[j].nodeValue){var k=d.attributes[j].nodeName.toLowerCase(),l=d.attributes[j].nodeValue;l&&(l&&"string"==typeof l&&(l=l.replace(/\"/gi,"&quot;")),i.setAttribute(k,l))}return xIE4Up&&(i.style.cssText=d.style.cssText),void d.parentNode.insertBefore(i,d)}if(c.hasClass("widgetSize")||c.hasClass("widgetBoxSize")){var d=b.parentNode.parentNode,e=d.getAttribute("widget");if(!e)return;return selectedWidget=d,void doShowWidgetSizeSetup(a.pageX,a.pageY,selectedWidget)}if(c.hasClass("widgetRemove")||c.hasClass("widgetBoxRemove")){var d=b.parentNode.parentNode,e=d.getAttribute("widget");return void(confirm(confirm_delete_msg)&&(restoreWidgetButtons(),d.parentNode.removeChild(d)))}for(var d=b;d;){if(jQuery(d).hasClass("widgetOutput")){a.cancelBubble=!0,a.returnValue=!1,a.preventDefault(),a.stopPropagation();break}d=d.parentNode}}}function completeCopyWidgetContent(a,b,c,d){var e=a.document_srl,f=xCreateElement("DIV");xInnerHtml(f,xInnerHtml(d)),f.widget_sequence="",f.className="widgetOutput";for(var g=0;g<d.attributes.length;g++)if(d.attributes[g].nodeName&&d.attributes[g].nodeValue){var h=d.attributes[g].nodeName.toLowerCase(),i=d.attributes[g].nodeValue;i&&(i&&"string"==typeof i&&(i=i.replace(/\"/gi,"&quot;")),f.setAttribute(h,i))}d.setAttribute("document_srl",e),xIE4Up&&(f.style.cssText=d.getAttribute("style").cssText),d.parentNode.insertBefore(f,d)}function completeDeleteWidgetContent(a,b,c,d){restoreWidgetButtons(),d.parentNode.removeChild(d)}function doCheckWidgetDrag(a){if(a.target){var b=a.target,c=jQuery(b);if(!(c.parents("#pageSizeLayer").size()>0||(doHideWidgetSizeSetup(),c.hasClass("widgetSetup")||c.hasClass("widgetStyle")||c.hasClass("widgetCopy")||c.hasClass("widgetBoxCopy")||c.hasClass("widgetSize")||c.hasClass("widgetBoxSize")||c.hasClass("widgetRemove")||c.hasClass("widgetBoxRemove"))))for(p_obj=b;p_obj;){var d=jQuery(p_obj);if(d.hasClass("widgetOutput")||d.hasClass("widgetResize")||d.hasClass("widgetResizeLeft")||d.hasClass("widgetBoxResize")||d.hasClass("widgetBoxResizeLeft"))return widgetDragEnable(p_obj,widgetDragStart,widgetDrag,widgetDragEnd),void widgetMouseDown(a);p_obj=p_obj.parentNode}}}function _getInt(a){return a&&"null"!=a?isNaN(parseInt(a,10))?0:parseInt(a,10):0}function doShowWidgetSizeSetup(a,b,c){var d=jQuery("#pageSizeLayer"),e=d.find(">form:first"),f=jQuery(c);if(e.length){selectedSizeWidget=c;var g=jQuery(selectedSizeWidget),h={widget_align:f.css("float"),css_class:g.attr("css_class")?g.attr("css_class"):"",width:f[0].style.width,height:f[0].style.height,padding_left:_getInt(f.attr("widget_padding_left")),padding_right:_getInt(f.attr("widget_padding_right")),padding_top:_getInt(f.attr("widget_padding_top")),padding_bottom:_getInt(f.attr("widget_padding_bottom")),margin_left:_getInt(f.css("marginLeft")),margin_right:_getInt(f.css("marginRight")),margin_top:_getInt(f.css("marginTop")),margin_bottom:_getInt(f.css("marginBottom")),border_top_color:transRGB2Hex(f.css("borderTopColor")),border_top_thick:f.css("borderTopWidth").replace(/px$/i,""),border_top_type:f.css("borderTopStyle"),border_bottom_color:transRGB2Hex(f.css("borderBottomColor")),border_bottom_thick:f.css("borderBottomWidth").replace(/px$/i,""),border_bottom_type:f.css("borderBottomStyle"),border_right_color:transRGB2Hex(f.css("borderRightColor")),border_right_thick:f.css("borderRightWidth").replace(/px$/i,""),border_right_type:f.css("borderRightStyle"),border_left_color:transRGB2Hex(f.css("borderLeftColor")),border_left_thick:f.css("borderLeftWidth").replace(/px$/i,""),border_left_type:f.css("borderLeftStyle"),background_color:transRGB2Hex(f.css("backgroundColor")),background_image_url:f.css("backgroundImage").replace(/^url\(/i,"").replace(/\)$/i,""),background_x:0,background_y:0,background_repeat:f.css("backgroundRepeat")},i=f.css("backgroundPosition");i&&(i=i.split(" "),2==i.length&&(h.background_x=i[0],h.background_y=i[1])),d.show(),jQuery(function(a){var b=a("#pageSizeLayer"),c=a(".x_modal-backdrop"),d=a(window).width(),e=a(window).height(),f=b.width(),g=b.height();d>f&&e>g?(c.show(),b.css({position:"fixed",top:e/2-g/2+"px",left:d/2-f/2+"px",width:"700px"})):(c.hide(),b.css({position:"static",top:"auto",left:"auto",width:"auto"}))}),jQuery.each(h,function(a,b){var c=e[0].elements[a];c&&(c.value=b,c.className.match(/\bcolor-indicator\b/)&&(c.style.background=c.value="#"+c.value)),"select"==c.tagName.toLowerCase()&&-1==c.selectedIndex&&(c.selectedIndex=0)});try{e[0].elements[0].focus()}catch(j){}}}function doHideWidgetSizeSetup(){jQuery("#pageSizeLayer, .x_modal-backdrop, .jPicker.Container").hide()}function _getSize(a){if(!a)return 0;var b="px";a.lastIndexOf("%")>=0&&(b="%");var c=parseInt(a,10);return 1>c?0:("%"==b&&c>100&&(c=100),""+c+b)}function _getBorderStyle(a,b,c){var d=a.value;d=d.replace(/^#/,""),d=d?"#"+d:"#FFFFFF";var e=b.value;e=e?parseInt(e,10)+"px":"0px";var f=c.options[c.selectedIndex].value;f||(f="solid");var g=d+" "+e+" "+f;return g}function _getBGColorStyle(a){var b=a.replace(/^#/,"");return b=b?"#"+b:"#FFFFFF"}function doApplyWidgetSize(a){if(selectedSizeWidget){1==a.widget_align.selectedIndex?setFloat(selectedSizeWidget,"right"):setFloat(selectedSizeWidget,"left");var b=jQuery(a),c=jQuery(selectedSizeWidget),d=b.find("#css_class").val();d&&c.attr("css_class",d);var e=_getSize(a.width.value);e&&(selectedSizeWidget.style.width=e);var f=_getSize(a.height.value);if(f&&"100%"!=f)selectedSizeWidget.style.height=f;else{selectedSizeWidget.style.height="";for(var g=xGetElementsByClassName("widgetBorder",selectedSizeWidget),h=0;h<g.length;h++){var i=g[h];i.style.height=""}}selectedSizeWidget.style.borderTop=_getBorderStyle(a.border_top_color,a.border_top_thick,a.border_top_type),selectedSizeWidget.style.borderBottom=_getBorderStyle(a.border_bottom_color,a.border_bottom_thick,a.border_bottom_type),selectedSizeWidget.style.borderLeft=_getBorderStyle(a.border_left_color,a.border_left_thick,a.border_left_type),selectedSizeWidget.style.borderRight=_getBorderStyle(a.border_right_color,a.border_right_thick,a.border_right_type),selectedSizeWidget.style.marginTop=_getSize(a.margin_top.value),selectedSizeWidget.style.marginRight=_getSize(a.margin_right.value),selectedSizeWidget.style.marginBottom=_getSize(a.margin_bottom.value),selectedSizeWidget.style.marginLeft=_getSize(a.margin_left.value),selectedSizeWidget.style.backgroundColor=a.background_color.value&&"#"!=a.background_color.value&&"transparent"!=a.background_color.value?_getBGColorStyle(a.background_color.value):"transparent";var j=a.background_image_url.value;switch(selectedSizeWidget.style.backgroundImage=j&&"none"!=j?"url("+j+")":"none",a.background_repeat.selectedIndex){case 1:selectedSizeWidget.style.backgroundRepeat="no-repeat";break;case 2:selectedSizeWidget.style.backgroundRepeat="repeat-x";break;case 3:selectedSizeWidget.style.backgroundRepeat="repeat-y";break;default:selectedSizeWidget.style.backgroundRepeat="repeat"}selectedSizeWidget.style.backgroundPosition=a.background_x.value+" "+a.background_y.value;for(var k=selectedSizeWidget.firstChild;k;){var l=jQuery(k);if("DIV"==k.nodeName&&(l.hasClass("widgetBorder")||l.hasClass("widgetBoxBorder"))){for(var m=k.firstChild;m;){if("DIV"==m.nodeName){m.style.padding="";var n=_getSize(a.padding_left.value);n?(m.style.paddingLeft=n,selectedSizeWidget.setAttribute("widget_padding_left",n)):(m.style.paddingLeft="",selectedSizeWidget.setAttribute("widget_padding_left",""));var o=_getSize(a.padding_right.value);o?(m.style.paddingRight=o,selectedSizeWidget.setAttribute("widget_padding_right",o)):(m.style.paddingRight="",selectedSizeWidget.setAttribute("widget_padding_right",""));var p=_getSize(a.padding_top.value);p?(m.style.paddingTop=p,selectedSizeWidget.setAttribute("widget_padding_top",p)):(m.style.paddingTop="",selectedSizeWidget.setAttribute("widget_padding_top",""));var q=_getSize(a.padding_bottom.value);q?(m.style.paddingBottom=q,selectedSizeWidget.setAttribute("widget_padding_bottom",q)):(m.style.paddingBottom="",selectedSizeWidget.setAttribute("widget_padding_bottom",""));break}m=m.nextSibling}break}k=k.nextSibling}selectedWidget=selectedSizeWidget,selectedSizeWidget=null;for(var r=selectedWidget.getAttribute("widget"),s=[],h=0;h<selectedWidget.attributes.length;h++)if(selectedWidget.attributes[h].nodeName&&selectedWidget.attributes[h].nodeValue){var t=selectedWidget.attributes[h].nodeName.toLowerCase();if("contenteditable"!=t&&"id"!=t&&"src"!=t&&"widget"!=t&&"body"!=t&&"class"!=t&&"widget_width"!=t&&"widget_width_type"!=t&&"xdpx"!=t&&"xdpy"!=t&&"height"!=t){var u=selectedWidget.attributes[h].nodeValue;u&&"Array"!=u&&(s[t]=u)}}s.style=getStyle(selectedWidget),s.selected_widget=r,s.module_srl=get_by_id("pageFo").module_srl.value,exec_xml("widget","procWidgetGenerateCodeInPage",s,function(a){doAddWidgetCode(a.widget_code)},["error","message","widget_code","tpl","css_header"])}doHideWidgetSizeSetup()}function restoreWidgetButtons(){var a=get_by_id("widgetButton"),b=get_by_id("widgetBoxButton");if(a&&b){a.style.visibility="hidden",get_by_id("zonePageContent").parentNode.appendChild(a),b.style.visibility="hidden",get_by_id("zonePageContent").parentNode.appendChild(b);for(var c=0;c<hideElements.length;c++){var d=hideElements[0];d.style.paddingTop=0}hideElements=[]}}function showWidgetButton(a,b){var c=get_by_id(a);c&&(c.style.visibility="visible",b.insertBefore(c,b.firstChild))}function widgetSetup(a){var b=a.target;if(!(jQuery(b).is(".widgetButtons")||jQuery(b).parents(".widgetButtons").size()>0||jQuery(b).is(".buttonBox")||jQuery(b).parents(".buttonBox").size()>0)){var c=jQuery(b).parents(".widgetOutput");if(0===c.size())return void restoreWidgetButtons();b=c.get(0);var d=c.attr("widget");if(d)if("widgetBox"==d)restoreWidgetButtons(),showWidgetButton("widgetBoxButton",b);else{restoreWidgetButtons(),showWidgetButton("widgetButton",b);var e=b.parentNode;if(e)for(;e;){if("DIV"==e.nodeName&&"widgetBox"==e.getAttribute("widget")){showWidgetButton("widgetBoxButton",e);break}e=e.parentNode}}}}function widgetCreateTmpObject(a){var b=a.getAttribute("id");return tmpObj=xCreateElement("DIV"),tmpObj.id=b+"_tmp",tmpObj.className=a.className,tmpObj.style.overflow="hidden",tmpObj.style.margin="0px",tmpObj.style.padding="0px",tmpObj.style.width=a.style.width,tmpObj.style.display="none",tmpObj.style.position="absolute",tmpObj.style.opacity=1,tmpObj.style.filter="alpha(opacity=100)",xLeft(tmpObj,xPageX(a)),xTop(tmpObj,xPageY(a)),document.body.appendChild(tmpObj),widgetTmpObject[a.id]=tmpObj,tmpObj}function widgetGetTmpObject(a){a.id||(a.id="widget_"+idStep++);var b=widgetTmpObject[a.id];return b||(b=widgetCreateTmpObject(a)),b}function widgetDragEnable(a,b,c,d){a.draggable=!0,a.dragStart=b,a.drag=c,a.dragEnd=d,widgetDragManager.isDrag||(widgetDragManager.isDrag=!0,jQuery(document).on("mousemove",widgetDragMouseMove))}function widgetDragStart(a){var b=jQuery(a);if(!(b.hasClass("widgetResize")||b.hasClass("widgetResizeLeft")||b.hasClass("widgetBoxResize")||b.hasClass("widgetBoxResizeLeft"))){var c=widgetGetTmpObject(a);xInnerHtml(c,xInnerHtml(a)),xLeft(c,xPageX(a)),xTop(c,xPageY(a)),xWidth(c,xWidth(a)),xHeight(c,xHeight(a)),xDisplay(c,"block")}}function widgetDrag(a,b,c){var d=jQuery(a),e=40,f=10,g=xPageX(a.parentNode),h=xPageY(a.parentNode),i=a.xDPX,j=a.xDPY,k=xWidth(zonePageObj),l=xPageX(zonePageObj),m=l+k,n=xWidth(a.parentNode),o=getFloat(a.parentNode);if(o||(o="left"),d.hasClass("widgetResize")||d.hasClass("widgetBoxResize")){g+e>i&&(i=g+e),i>m&&(i=m),"right"==o&&(i=g+n);var p=i-g;e>p&&(p=e);var q=j-h;f>q&&(q=f),g+p>m&&(p=m-g),xWidth(a.parentNode,p),xHeight(a.parentNode,q)}else if(d.hasClass("widgetResizeLeft")||d.hasClass("widgetBoxResizeLeft")){l>i&&(i=l),"left"==o&&(i=g);var p=n+(g-i);e>p&&(p=e);var q=j-h;f>q&&(q=f),xWidth(a.parentNode,p),xHeight(a.parentNode,q)}else{var r=widgetGetTmpObject(a);if(xLeft(r,parseInt(xPageX(r),10)+parseInt(b,10)),xTop(r,parseInt(xPageY(r),10)+parseInt(c,10)),a.parentNode!=zonePageObj){for(var s=xGetElementsByClassName("widgetOutput",a.parentNode),t=0;t<s.length;t++){var u=s[t],v=xPageX(u),w=xPageY(u),x=parseInt(v,10)+parseInt(xWidth(u),10),y=parseInt(w,10)+parseInt(xHeight(u),10);if(a!=u&&a.xDPX>=v&&a.xDPX<=x&&a.xDPY>=w&&a.xDPY<=y&&a.parentNode==u.parentNode){var z=u.nextSibling;z||(z=xCreateElement("DIV"),u.parentNode.appendChild(z));var A=a.nextSibling;return A||(A=xCreateElement("DIV"),a.parentNode.appendChild(A)),z&&z.parentNode.insertBefore(a,z),A&&A.parentNode.insertBefore(u,A),void(s=null)}}s=null;var B=jQuery(a).parents("div.nullWidget").get(0),v=xPageX(B),w=xPageY(B),x=parseInt(v,10)+parseInt(xWidth(B),10),y=parseInt(w,10)+parseInt(xHeight(B),10);if(a.xDPX<v||a.xDPX>x||a.xDPY<w||a.xDPY>y)return void zonePageObj.insertBefore(a,jQuery(a).parents("div.widgetOutput[widget=widgetBox]").get(0))}else{if("widgetBox"!=a.getAttribute("widget")){for(var C=xGetElementsByClassName("nullWidget",zonePageObj),t=0;t<C.length;t++){var u=C[t],D=jQuery(u);xHeight(u,xHeight(u.parentNode)),xWidth(u,xWidth(u.parentNode));var v=xPageX(u),w=xPageY(u),x=parseInt(v,10)+parseInt(xWidth(u),10),y=parseInt(w,10)+parseInt(xHeight(u),10);if(a.xDPX>=v&&a.xDPX<=x&&a.xDPY>=w&&a.xDPY<=y&&D.hasClass("nullWidget")){var E=jQuery("div.widget_inner",D);return 0===E.size()?u.appendChild(a):E.get(0).appendChild(a),widgetManualEnd(),void(C=null)}}C=null}for(var s=xGetElementsByClassName("widgetOutput",zonePageObj),t=0;t<s.length;t++){var u=s[t],F=u.getAttribute("widget");if("widgetBox"!=F&&u.parentNode==zonePageObj){var v=xPageX(u),w=xPageY(u),x=parseInt(v,10)+parseInt(xWidth(u),10),y=parseInt(w,10)+parseInt(xHeight(u),10);if(a!=u&&a.xDPX>=v&&a.xDPX<=x&&a.xDPY>=w&&a.xDPY<=y&&a.parentNode==u.parentNode){var z=u.nextSibling;z||(z=u.parentNode.lastChild),z||(z=xCreateElement("DIV"),u.parentNode.appendChild(z));var A=a.nextSibling;return A||(A=xCreateElement("DIV"),a.parentNode.appendChild(A)),z&&z.parentNode.insertBefore(a,z),A&&A.parentNode.insertBefore(u,A),void(s=null)}}}s=null}}}function widgetDragEnd(a){var b=widgetGetTmpObject(a);widgetDisapear=widgetDisapearObject(b,a),widgetDragDisable(a.getAttribute("id"))}function widgetDisapearObject(a,b){xInnerHtml(b,xInnerHtml(a)),xInnerHtml(a,""),jQuery(a).hide(),a.parentNode.removeChild(a),widgetTmpObject[b.id]=null}function widgetMouseDown(a){for(var b=a.target;b&&!b.draggable;)b=xParent(b,!0);b&&(a.preventDefault(),b.xDPX=a.pageX,b.xDPY=a.pageY,widgetDragManager.obj=b,jQuery(document).on("mouseup",widgetMouseUp),b.dragStart&&b.dragStart(b,a.pageX,a.pageY))}function widgetMouseUp(a){widgetDragManager.obj&&(a.preventDefault(),jQuery(document).off("mouseup",widgetMouseUp),widgetDragManager.obj.dragEnd&&widgetDragManager.obj.dragEnd(widgetDragManager.obj,a.pageX,a.pageY),widgetDragManager.obj=null,widgetDragManager.isDrag=!1)}function widgetDragMouseMove(a){if(widgetDragManager.obj){a.preventDefault();var b=widgetDragManager.obj,c=a.pageX-b.xDPX,d=a.pageY-b.xDPY;b.xDPX=a.pageX,b.xDPY=a.pageY,b.drag?b.drag(b,c,d):xMoveTo(b,xLeft(b)+c,xTop(b)+d)}}function widgetDragDisable(a){if(widgetDragManager){var b=get_by_id(a);b.draggable=!1,b.dragStart=null,b.drag=null,b.dragEnd=null,jQuery(b).off("mousedown",widgetMouseDown)}}function widgetManualEnd(){var a=widgetDragManager.obj;if(a){jQuery(document).off("mouseup",widgetMouseUp),jQuery(document).on("mousemove",widgetDragMouseMove);var b=widgetGetTmpObject(a);widgetDisapear=widgetDisapearObject(b,a),widgetDragDisable(a.getAttribute("id")),widgetDragManager.obj=null,widgetDragManager.isDrag=!1}}var zonePageObj=null,zoneModuleSrl=0,selectedWidget=null,writedText=null,checkDocumentWrite=!1;window.document.write=window.document.writeln=function(a){if(checkDocumentWrite)return void(writedText=a);if(!a.match(/^<\//)){window.opera||(a=a.replace(/&(?![#a-z0-9]+;)/g,"&")),a=a.replace(/(<[a-z]+)/g,"$1 xmlns='http://www.w3.org/1999/xhtml'");var b,c=jQuery("<div>").html(a)[0];b=document.getElementsByTagName("*"),b=b[b.length-1];for(var d=c.childNodes;d.length;)b.parentNode.appendChild(d[0])}};var selectedSizeWidget=null;jQuery(function(a){a(document).keydown(function(b){var c=a(".jPicker.Container:visible");return 27!=b.which||c.length?27==b.which&&c.length?(c.hide(),!1):!0:(doHideWidgetSizeSetup(),!1)})});var hideElements=[],widgetDragManager={obj:null,isDrag:!1},widgetTmpObject=[],widgetDisappear=0,idStep=0;
\ No newline at end of file
+function getStyle(a){var b=a.getAttribute("style");return b||(b=a.style),"object"==typeof b&&(b=b.cssText),b=b.replace(/\burl\s*\(\s*"(.*?)"\s*\)/i,"url('$1')")}function getFloat(a){return jQuery(a).css("float")}function setFloat(a,b){jQuery(a).css("float",b)}function getPadding(a,b){var c=a.getAttribute("widget_padding_"+b);return c&&null!==c||(c=0),c}function doStartPageModify(a,b){zonePageObj=get_by_id(a),zoneModuleSrl=b,jQuery("#tmpPageSizeLayer").appendTo("body").hide().attr("id","pageSizeLayer").css({position:"fixed"}).before('<div class="x_modal-backdrop" />').find(">form").submit(function(){return doApplyWidgetSize(this),!1}),jQuery("#zonePageContent").on("click",doCheckWidget).on("mousedown",doCheckWidgetDrag).on("mouseover",widgetSetup)}function removeAllWidget(){confirm(confirm_delete_msg)&&(restoreWidgetButtons(),jQuery(zonePageObj).html(""))}function getWidgetContent(a){var b="";"undefined"!=typeof a&&a||(a=zonePageObj);var c=null;return jQuery("div.widgetOutput",a).each(function(){if(jQuery(this).parent().get(0)==a)switch(c=jQuery(this).attr("widget")){case"widgetBox":b+=getWidgetBoxCode(this,c);break;case"widgetContent":b+=getContentWidgetCode(this,c);break;default:b+=getWidgetCode(this,c)}}),b}function getContentWidgetCode(a){var b,c=(a.firstChild,jQuery("div.widgetContent",a)),d="",e="",f=0,g="contenteditable,id,style,src,widget,body,class,widget_width,widget_width_type,xdpx,xdpy,height,document_srl,widget_padding_left,widget_padding_right,widget_padding_top,widget_padding_bottom,hascontent";if(c.size()>0){f=jQuery(a).attr("document_srl"),d=f>0?"":c.html();for(var h,i=new RegExp("^("+g.replace(/,/g,"|")+")$","i"),j=0;j<a.attributes.length;j++)(b=a.attributes[j].nodeName)&&a.attributes[j].nodeValue&&(i.test(b)||(h=a.attributes[j].nodeValue)&&(e+=b+'="'+encodeURIComponent(h)+'" '));return'<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="'+getStyle(a)+'" body="'+d+'" document_srl="'+f+'" widget_padding_left="'+getPadding(a,"left")+'" widget_padding_right="'+getPadding(a,"right")+'" widget_padding_top="'+getPadding(a,"top")+'" widget_padding_bottom="'+getPadding(a,"bottom")+'" '+e+" />"}return""}function getWidgetBoxCode(a){for(var b="",c=0;c<a.attributes.length;c++)if(a.attributes[c].nodeName&&a.attributes[c].nodeValue&&!/^jquery[0-9]+/i.test(a.attributes[c].nodeName)){var d=a.attributes[c].nodeName.toLowerCase();if("widget_padding_left"!=d&&"widget_padding_right"!=d&&"widget_padding_top"!=d&&"widget_padding_bottom"!=d&&"contenteditable"!=d&&"id"!=d&&"style"!=d&&"src"!=d&&"widget"!=d&&"body"!=d&&"class"!=d&&"widget_width"!=d&&"widget_width_type"!=d&&"xdpx"!=d&&"xdpy"!=d&&"height"!=d){var e=a.attributes[c].nodeValue;e&&"Array"!=e&&(b+=d+'="'+encodeURIComponent(e)+'" ')}}var f;jQuery(".widget_inner",a).size()>0?(f=jQuery(".widget_inner",a),f=f.get(0)):f=jQuery(".nullWidget",a).get(0);var g=getWidgetContent(f);return'<div widget="widgetBox" style="'+getStyle(a)+'" widget_padding_left="'+getPadding(a,"left")+'" widget_padding_right="'+getPadding(a,"right")+'" widget_padding_top="'+getPadding(a,"top")+'" widget_padding_bottom="'+getPadding(a,"bottom")+'" '+b+"><div><div>"+g+"</div></div></div>"}function getWidgetCode(a,b){for(var c="",d=0;d<a.attributes.length;d++)if(a.attributes[d].nodeName&&a.attributes[d].nodeValue&&!/^jquery[0-9]+/i.test(a.attributes[d].nodeName)){var e=a.attributes[d].nodeName.toLowerCase();if("contenteditable"!=e&&"id"!=e&&"style"!=e&&"src"!=e&&"widget"!=e&&"body"!=e&&"class"!=e&&"widget_width"!=e&&"widget_width_type"!=e&&"xdpx"!=e&&"xdpy"!=e&&"height"!=e){var f=a.attributes[d].nodeValue;f&&"Array"!=f&&"null"!=f&&(c+=e+'="'+encodeURIComponent(f)+'" ')}}a.getAttribute("style");return'<img class="zbxe_widget_output" style="'+getStyle(a)+'" widget="'+b+'" '+c+" />"}function doAddContent(a){var b=request_uri.setQuery("module","widget").setQuery("act","dispWidgetAdminAddContent").setQuery("module_srl",zoneModuleSrl).setQuery("mid",a);popopen(b,"addContent")}function doSyncPageContent(){if(opener&&opener.selectedWidget){var a=get_by_id("content_fo"),b=opener.selectedWidget;a.style.value=getStyle(opener.selectedWidget),a.widget_padding_left.value=getPadding(b,"left"),a.widget_padding_right.value=getPadding(b,"right"),a.widget_padding_bottom.value=getPadding(b,"bottom"),a.widget_padding_top.value=getPadding(b,"top");for(var c=b.firstChild;c&&!jQuery(c).hasClass("widgetContent");)c=c.nextSibling;if(c&&jQuery(c).hasClass("widgetContent")&&(!a.document_srl||"0"==a.document_srl.value))try{var d=Base64.decode(xInnerHtml(c));d=editorReplacePath(d),get_by_id("content_fo").content.value=d,xe.Editors[1].exec("SET_IR",[d])}catch(e){}}"undefined"!=typeof editorStart&&editorStart(1,"module_srl","content",!1,400)}function addContentWidget(a){var b=a.getAttribute("editor_sequence"),c=(a.mid.value,a.module_srl.value),d=a.document_srl.value,e=editorGetContent(b),f={editor_sequence:b,content:e,module_srl:c,document_srl:d};if(/^\s*<p>.*<\/p>\s*$/i.test(f.content)){var g=f.content.toLowerCase(),h=g.indexOf("</p>"),i=g.lastIndexOf("</p>");h>0&&i>0&&h==i&&(f.content=e=f.content.replace(/^\s*<p>|<\/p>\s*$/gi,""))}return exec_xml("widget","procWidgetInsertDocument",f,function(b){if(b&&"0"==b.error){var c=b.document_srl,d=opener.jQuery("div.widgetOutput[widget=widgetContent][document_srl="+c+"]"),f=[];d.size()>0&&(f=d.get(0).attributes);for(var g='<div class="widgetOutput" style="'+a.style.value+'" widget_padding_left="'+a.widget_padding_left.value+'" widget_padding_right="'+a.widget_padding_right.value+'" widget_padding_top="'+a.widget_padding_top.value+'" widget_padding_bottom="'+a.widget_padding_bottom.value+'" document_srl="'+c+'" widget="widgetContent"><button type="button" class="widgetResize"></button><button type="button" class="widgetResizeLeft"></button><div class="widgetBorder"><div style="padding:'+a.widget_padding_top.value+"px "+a.widget_padding_right.value+"px "+a.widget_padding_bottom.value+"px "+a.widget_padding_left.value+'px"></div>'+e+'</div><div class="widgetContent" style="display:none;width:1px;height:1px;overflow:hidden;"></div></div>',h=jQuery(g),i=0,j=f.length;j>i;i++)h.attr(f[i].name)||h.attr(f[i].name,f[i].value);g=jQuery("<div>").append(h).html(),opener.doAddWidgetCode(g),window.close()}},"document_srl".split(",")),!1}function doAddWidgetBox(){var a='<div class="widgetOutput" style="float:left;width:100%;height:20px;" widget="widgetBox" ><button type="button" class="widgetBoxResize"></button><button type="button" class="widgetBoxResizeLeft"></button><div class="widgetBoxBorder"><div class="nullWidget" style="width:100%;height:100px;"></div></div></div>';zonePageObj.innerHTML+=a}function doAddWidget(a){var b=a.widget_list,c=b.selectedIndex,d=b.options[c].value,e=a.module_srl.value,f=request_uri.setQuery("module","widget").setQuery("act","dispWidgetGenerateCodeInPage").setQuery("selected_widget",d).setQuery("module_srl",e);popopen(f,"GenerateWidgetCode")}function doAddWidgetCode(widget_code){restoreWidgetButtons();for(var tmp=widget_code;tmp.indexOf("<!--#Meta:")>-1;){var pos=tmp.indexOf("<!--#Meta:");tmp=tmp.substr(pos);var eos=tmp.indexOf("-->"),cssfile=tmp.substr(10,eos-10);if(cssfile.indexOf(".js")>-1)tmp=tmp.substr(eos);else{if(!cssfile)break;if(tmp=tmp.substr(eos),cssfile=request_uri+cssfile,"undefined"==typeof document.createStyleSheet){var css='<link rel="stylesheet" href="'+cssfile+'" />',dummy=xCreateElement("DIV");xInnerHtml(dummy,css),document.body.appendChild(dummy)}else document.createStyleSheet(cssfile,0)}}for(checkDocumentWrite=!0,tmp=widget_code.toLowerCase();tmp.indexOf("<script")>-1;){var pos=tmp.indexOf("<script");tmp=tmp.substr(pos);var length=tmp.indexOf("</script>")+9,script=widget_code.substr(pos,length);script=script.replace(/^<script([^>]*)>/i,"").replace(/<\/script>$/i,""),writedText=null;try{eval(script)}catch(e){}widget_code=widget_code.substr(0,pos)+writedText+widget_code.substr(pos+length),tmp=widget_code.toLowerCase()}var dummy=xCreateElement("div");xInnerHtml(dummy,widget_code);var obj=dummy.childNodes[0];if(selectedWidget&&selectedWidget.getAttribute("widget")){var o=jQuery("div.widget_inner",selectedWidget),n=jQuery("div.widget_inner",obj);0===n.size()&&(n=jQuery("div.nullWidget",obj)),0===o.size()&&(o=jQuery("div.nullWidget",selectedWidget)),n.html(o.html()),selectedWidget.parentNode.insertBefore(obj,selectedWidget),selectedWidget.parentNode.removeChild(selectedWidget)}else get_by_id("zonePageContent").appendChild(obj);checkDocumentWrite=!1,selectedWidget=null}function doCheckWidget(a){if(a.target){var b=a.target,c=jQuery(b);if(selectedWidget=null,doHideWidgetSizeSetup(),c.hasClass("widgetSetup")){var d=b.parentNode.parentNode,e=d.getAttribute("widget");if(!e)return;return selectedWidget=d,void("widgetContent"==e?popopen(request_uri+"?module=widget&act=dispWidgetAdminAddContent&module_srl="+zoneModuleSrl+"&document_srl="+d.getAttribute("document_srl"),"addContent"):popopen(request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+e+"&widgetstyle="+f,"GenerateCodeInPage"))}if(c.hasClass("widgetStyle")){var d=b.parentNode.parentNode,e=d.getAttribute("widget"),f=d.getAttribute("widgetstyle");if(!e)return;return selectedWidget=d,void popopen(request_uri+"?module=widget&act=dispWidgetStyleGenerateCodeInPage&selected_widget="+e+"&widgetstyle="+f,"GenerateCodeInPage")}if(c.hasClass("widgetCopy")&&jQuery(b.parentNode.parentNode).hasClass("widgetOutput")){var d=b.parentNode.parentNode;if(restoreWidgetButtons(),"widgetContent"==d.getAttribute("widget")&&d.getAttribute("document_srl")){var g=["error","message","document_srl"],h=[];return h.document_srl=d.getAttribute("document_srl"),void exec_xml("widget","procWidgetCopyDocument",h,completeCopyWidgetContent,g,h,d)}var i=xCreateElement("DIV");xInnerHtml(i,xInnerHtml(d)),i.widget_sequence="",i.className="widgetOutput";for(var j=0;j<d.attributes.length;j++)if(d.attributes[j].nodeName&&d.attributes[j].nodeValue){var k=d.attributes[j].nodeName.toLowerCase(),l=d.attributes[j].nodeValue;l&&(l&&"string"==typeof l&&(l=l.replace(/\"/gi,"&quot;")),i.setAttribute(k,l))}return xIE4Up&&(i.style.cssText=d.style.cssText),void d.parentNode.insertBefore(i,d)}if(c.hasClass("widgetSize")||c.hasClass("widgetBoxSize")){var d=b.parentNode.parentNode,e=d.getAttribute("widget");if(!e)return;return selectedWidget=d,void doShowWidgetSizeSetup(a.pageX,a.pageY,selectedWidget)}if(c.hasClass("widgetRemove")||c.hasClass("widgetBoxRemove")){var d=b.parentNode.parentNode,e=d.getAttribute("widget");return void(confirm(confirm_delete_msg)&&(restoreWidgetButtons(),d.parentNode.removeChild(d)))}for(var d=b;d;){if(jQuery(d).hasClass("widgetOutput")){a.cancelBubble=!0,a.returnValue=!1,a.preventDefault(),a.stopPropagation();break}d=d.parentNode}}}function completeCopyWidgetContent(a,b,c,d){var e=a.document_srl,f=xCreateElement("DIV");xInnerHtml(f,xInnerHtml(d)),f.widget_sequence="",f.className="widgetOutput";for(var g=0;g<d.attributes.length;g++)if(d.attributes[g].nodeName&&d.attributes[g].nodeValue){var h=d.attributes[g].nodeName.toLowerCase(),i=d.attributes[g].nodeValue;i&&(i&&"string"==typeof i&&(i=i.replace(/\"/gi,"&quot;")),f.setAttribute(h,i))}d.setAttribute("document_srl",e),xIE4Up&&(f.style.cssText=d.getAttribute("style").cssText),d.parentNode.insertBefore(f,d)}function completeDeleteWidgetContent(a,b,c,d){restoreWidgetButtons(),d.parentNode.removeChild(d)}function doCheckWidgetDrag(a){if(a.target){var b=a.target,c=jQuery(b);if(!(c.parents("#pageSizeLayer").size()>0||(doHideWidgetSizeSetup(),c.hasClass("widgetSetup")||c.hasClass("widgetStyle")||c.hasClass("widgetCopy")||c.hasClass("widgetBoxCopy")||c.hasClass("widgetSize")||c.hasClass("widgetBoxSize")||c.hasClass("widgetRemove")||c.hasClass("widgetBoxRemove"))))for(p_obj=b;p_obj;){var d=jQuery(p_obj);if(d.hasClass("widgetOutput")||d.hasClass("widgetResize")||d.hasClass("widgetResizeLeft")||d.hasClass("widgetBoxResize")||d.hasClass("widgetBoxResizeLeft"))return widgetDragEnable(p_obj,widgetDragStart,widgetDrag,widgetDragEnd),void widgetMouseDown(a);p_obj=p_obj.parentNode}}}function _getInt(a){return a&&"null"!=a?isNaN(parseInt(a,10))?0:parseInt(a,10):0}function doShowWidgetSizeSetup(a,b,c){var d=jQuery("#pageSizeLayer"),e=d.find(">form:first"),f=jQuery(c);if(e.length){selectedSizeWidget=c;var g=jQuery(selectedSizeWidget),h={widget_align:f.css("float"),css_class:g.attr("css_class")?g.attr("css_class"):"",width:f[0].style.width,height:f[0].style.height,padding_left:_getInt(f.attr("widget_padding_left")),padding_right:_getInt(f.attr("widget_padding_right")),padding_top:_getInt(f.attr("widget_padding_top")),padding_bottom:_getInt(f.attr("widget_padding_bottom")),margin_left:_getInt(f.css("marginLeft")),margin_right:_getInt(f.css("marginRight")),margin_top:_getInt(f.css("marginTop")),margin_bottom:_getInt(f.css("marginBottom")),border_top_color:transRGB2Hex(f.css("borderTopColor")),border_top_thick:f.css("borderTopWidth").replace(/px$/i,""),border_top_type:f.css("borderTopStyle"),border_bottom_color:transRGB2Hex(f.css("borderBottomColor")),border_bottom_thick:f.css("borderBottomWidth").replace(/px$/i,""),border_bottom_type:f.css("borderBottomStyle"),border_right_color:transRGB2Hex(f.css("borderRightColor")),border_right_thick:f.css("borderRightWidth").replace(/px$/i,""),border_right_type:f.css("borderRightStyle"),border_left_color:transRGB2Hex(f.css("borderLeftColor")),border_left_thick:f.css("borderLeftWidth").replace(/px$/i,""),border_left_type:f.css("borderLeftStyle"),background_color:transRGB2Hex(f.css("backgroundColor")),background_image_url:f.css("backgroundImage").replace(/^url\(/i,"").replace(/\)$/i,""),background_x:0,background_y:0,background_repeat:f.css("backgroundRepeat")},i=f.css("backgroundPosition");i&&(i=i.split(" "),2==i.length&&(h.background_x=i[0],h.background_y=i[1])),d.show(),jQuery(function(a){var b=a("#pageSizeLayer"),c=a(".x_modal-backdrop"),d=a(window).width(),e=a(window).height(),f=b.width(),g=b.height();d>f&&e>g?(c.show(),b.css({position:"fixed",top:e/2-g/2+"px",left:d/2-f/2+"px",width:"700px"})):(c.hide(),b.css({position:"static",top:"auto",left:"auto",width:"auto"}))}),jQuery.each(h,function(a,b){var c=e[0].elements[a],d=jQuery(c);c&&(d.val(b),d.hasClass("color-indicator")&&"transparent"!=b&&(b=b.toUpperCase(),d.css("background","#"+b),d.val("#"+b))),"select"==c.tagName.toLowerCase()&&-1==c.selectedIndex&&(c.selectedIndex=0)});try{e[0].elements[0].focus()}catch(j){}}}function doHideWidgetSizeSetup(){jQuery("#pageSizeLayer, .x_modal-backdrop, .jPicker.Container").hide()}function _getSize(a){if(!a)return 0;var b="px";a.lastIndexOf("%")>=0&&(b="%");var c=parseInt(a,10);return 1>c?0:("%"==b&&c>100&&(c=100),""+c+b)}function _getBorderStyle(a,b,c){var d=a.value;d=d.replace(/^#/,""),d=d?"#"+d:"#FFFFFF";var e=b.value;e=e?parseInt(e,10)+"px":"0px";var f=c.options[c.selectedIndex].value;f||(f="solid");var g=d+" "+e+" "+f;return g}function _getBGColorStyle(a){var b=a.replace(/^#/,"");return b=b?"#"+b:"#FFFFFF"}function doApplyWidgetSize(a){if(selectedSizeWidget){1==a.widget_align.selectedIndex?setFloat(selectedSizeWidget,"right"):setFloat(selectedSizeWidget,"left");var b=jQuery(a),c=jQuery(selectedSizeWidget),d=b.find("#css_class").val();d&&c.attr("css_class",d);var e=_getSize(a.width.value);e&&(selectedSizeWidget.style.width=e);var f=_getSize(a.height.value);if(f&&"100%"!=f)selectedSizeWidget.style.height=f;else{selectedSizeWidget.style.height="";for(var g=xGetElementsByClassName("widgetBorder",selectedSizeWidget),h=0;h<g.length;h++){var i=g[h];i.style.height=""}}selectedSizeWidget.style.borderTop=_getBorderStyle(a.border_top_color,a.border_top_thick,a.border_top_type),selectedSizeWidget.style.borderBottom=_getBorderStyle(a.border_bottom_color,a.border_bottom_thick,a.border_bottom_type),selectedSizeWidget.style.borderLeft=_getBorderStyle(a.border_left_color,a.border_left_thick,a.border_left_type),selectedSizeWidget.style.borderRight=_getBorderStyle(a.border_right_color,a.border_right_thick,a.border_right_type),selectedSizeWidget.style.marginTop=_getSize(a.margin_top.value),selectedSizeWidget.style.marginRight=_getSize(a.margin_right.value),selectedSizeWidget.style.marginBottom=_getSize(a.margin_bottom.value),selectedSizeWidget.style.marginLeft=_getSize(a.margin_left.value),selectedSizeWidget.style.backgroundColor=a.background_color.value&&"#"!=a.background_color.value&&"transparent"!=a.background_color.value?_getBGColorStyle(a.background_color.value):"transparent";var j=a.background_image_url.value;switch(selectedSizeWidget.style.backgroundImage=j&&"none"!=j?"url("+j+")":"none",a.background_repeat.selectedIndex){case 1:selectedSizeWidget.style.backgroundRepeat="no-repeat";break;case 2:selectedSizeWidget.style.backgroundRepeat="repeat-x";break;case 3:selectedSizeWidget.style.backgroundRepeat="repeat-y";break;default:selectedSizeWidget.style.backgroundRepeat="repeat"}selectedSizeWidget.style.backgroundPosition=a.background_x.value+" "+a.background_y.value;for(var k=selectedSizeWidget.firstChild;k;){var l=jQuery(k);if("DIV"==k.nodeName&&(l.hasClass("widgetBorder")||l.hasClass("widgetBoxBorder"))){for(var m=k.firstChild;m;){if("DIV"==m.nodeName){m.style.padding="";var n=_getSize(a.padding_left.value);n?(m.style.paddingLeft=n,selectedSizeWidget.setAttribute("widget_padding_left",n)):(m.style.paddingLeft="",selectedSizeWidget.setAttribute("widget_padding_left",""));var o=_getSize(a.padding_right.value);o?(m.style.paddingRight=o,selectedSizeWidget.setAttribute("widget_padding_right",o)):(m.style.paddingRight="",selectedSizeWidget.setAttribute("widget_padding_right",""));var p=_getSize(a.padding_top.value);p?(m.style.paddingTop=p,selectedSizeWidget.setAttribute("widget_padding_top",p)):(m.style.paddingTop="",selectedSizeWidget.setAttribute("widget_padding_top",""));var q=_getSize(a.padding_bottom.value);q?(m.style.paddingBottom=q,selectedSizeWidget.setAttribute("widget_padding_bottom",q)):(m.style.paddingBottom="",selectedSizeWidget.setAttribute("widget_padding_bottom",""));break}m=m.nextSibling}break}k=k.nextSibling}selectedWidget=selectedSizeWidget,selectedSizeWidget=null;for(var r=selectedWidget.getAttribute("widget"),s=[],h=0;h<selectedWidget.attributes.length;h++)if(selectedWidget.attributes[h].nodeName&&selectedWidget.attributes[h].nodeValue){var t=selectedWidget.attributes[h].nodeName.toLowerCase();if("contenteditable"!=t&&"id"!=t&&"src"!=t&&"widget"!=t&&"body"!=t&&"class"!=t&&"widget_width"!=t&&"widget_width_type"!=t&&"xdpx"!=t&&"xdpy"!=t&&"height"!=t){var u=selectedWidget.attributes[h].nodeValue;u&&"Array"!=u&&(s[t]=u)}}s.style=getStyle(selectedWidget),s.selected_widget=r,s.module_srl=get_by_id("pageFo").module_srl.value,exec_xml("widget","procWidgetGenerateCodeInPage",s,function(a){doAddWidgetCode(a.widget_code)},["error","message","widget_code","tpl","css_header"])}doHideWidgetSizeSetup()}function restoreWidgetButtons(){var a=get_by_id("widgetButton"),b=get_by_id("widgetBoxButton");if(a&&b){a.style.visibility="hidden",get_by_id("zonePageContent").parentNode.appendChild(a),b.style.visibility="hidden",get_by_id("zonePageContent").parentNode.appendChild(b);for(var c=0;c<hideElements.length;c++){var d=hideElements[0];d.style.paddingTop=0}hideElements=[]}}function showWidgetButton(a,b){var c=get_by_id(a);c&&(c.style.visibility="visible",b.insertBefore(c,b.firstChild))}function widgetSetup(a){var b=a.target;if(!(jQuery(b).is(".widgetButtons")||jQuery(b).parents(".widgetButtons").size()>0||jQuery(b).is(".buttonBox")||jQuery(b).parents(".buttonBox").size()>0)){var c=jQuery(b).parents(".widgetOutput");if(0===c.size())return void restoreWidgetButtons();b=c.get(0);var d=c.attr("widget");if(d)if("widgetBox"==d)restoreWidgetButtons(),showWidgetButton("widgetBoxButton",b);else{restoreWidgetButtons(),showWidgetButton("widgetButton",b);var e=b.parentNode;if(e)for(;e;){if("DIV"==e.nodeName&&"widgetBox"==e.getAttribute("widget")){showWidgetButton("widgetBoxButton",e);break}e=e.parentNode}}}}function widgetCreateTmpObject(a){var b=a.getAttribute("id");return tmpObj=xCreateElement("DIV"),tmpObj.id=b+"_tmp",tmpObj.className=a.className,tmpObj.style.overflow="hidden",tmpObj.style.margin="0px",tmpObj.style.padding="0px",tmpObj.style.width=a.style.width,tmpObj.style.display="none",tmpObj.style.position="absolute",tmpObj.style.opacity=1,tmpObj.style.filter="alpha(opacity=100)",xLeft(tmpObj,xPageX(a)),xTop(tmpObj,xPageY(a)),document.body.appendChild(tmpObj),widgetTmpObject[a.id]=tmpObj,tmpObj}function widgetGetTmpObject(a){a.id||(a.id="widget_"+idStep++);var b=widgetTmpObject[a.id];return b||(b=widgetCreateTmpObject(a)),b}function widgetDragEnable(a,b,c,d){a.draggable=!0,a.dragStart=b,a.drag=c,a.dragEnd=d,widgetDragManager.isDrag||(widgetDragManager.isDrag=!0,jQuery(document).on("mousemove",widgetDragMouseMove))}function widgetDragStart(a){var b=jQuery(a);if(!(b.hasClass("widgetResize")||b.hasClass("widgetResizeLeft")||b.hasClass("widgetBoxResize")||b.hasClass("widgetBoxResizeLeft"))){var c=widgetGetTmpObject(a);xInnerHtml(c,xInnerHtml(a)),xLeft(c,xPageX(a)),xTop(c,xPageY(a)),xWidth(c,xWidth(a)),xHeight(c,xHeight(a)),xDisplay(c,"block")}}function widgetDrag(a,b,c){var d=jQuery(a),e=40,f=10,g=xPageX(a.parentNode),h=xPageY(a.parentNode),i=a.xDPX,j=a.xDPY,k=xWidth(zonePageObj),l=xPageX(zonePageObj),m=l+k,n=xWidth(a.parentNode),o=getFloat(a.parentNode);if(o||(o="left"),d.hasClass("widgetResize")||d.hasClass("widgetBoxResize")){g+e>i&&(i=g+e),i>m&&(i=m),"right"==o&&(i=g+n);var p=i-g;e>p&&(p=e);var q=j-h;f>q&&(q=f),g+p>m&&(p=m-g),xWidth(a.parentNode,p),xHeight(a.parentNode,q)}else if(d.hasClass("widgetResizeLeft")||d.hasClass("widgetBoxResizeLeft")){l>i&&(i=l),"left"==o&&(i=g);var p=n+(g-i);e>p&&(p=e);var q=j-h;f>q&&(q=f),xWidth(a.parentNode,p),xHeight(a.parentNode,q)}else{var r=widgetGetTmpObject(a);if(xLeft(r,parseInt(xPageX(r),10)+parseInt(b,10)),xTop(r,parseInt(xPageY(r),10)+parseInt(c,10)),a.parentNode!=zonePageObj){for(var s=xGetElementsByClassName("widgetOutput",a.parentNode),t=0;t<s.length;t++){var u=s[t],v=xPageX(u),w=xPageY(u),x=parseInt(v,10)+parseInt(xWidth(u),10),y=parseInt(w,10)+parseInt(xHeight(u),10);if(a!=u&&a.xDPX>=v&&a.xDPX<=x&&a.xDPY>=w&&a.xDPY<=y&&a.parentNode==u.parentNode){var z=u.nextSibling;z||(z=xCreateElement("DIV"),u.parentNode.appendChild(z));var A=a.nextSibling;return A||(A=xCreateElement("DIV"),a.parentNode.appendChild(A)),z&&z.parentNode.insertBefore(a,z),A&&A.parentNode.insertBefore(u,A),void(s=null)}}s=null;var B=jQuery(a).parents("div.nullWidget").get(0),v=xPageX(B),w=xPageY(B),x=parseInt(v,10)+parseInt(xWidth(B),10),y=parseInt(w,10)+parseInt(xHeight(B),10);if(a.xDPX<v||a.xDPX>x||a.xDPY<w||a.xDPY>y)return void zonePageObj.insertBefore(a,jQuery(a).parents("div.widgetOutput[widget=widgetBox]").get(0))}else{if("widgetBox"!=a.getAttribute("widget")){for(var C=xGetElementsByClassName("nullWidget",zonePageObj),t=0;t<C.length;t++){var u=C[t],D=jQuery(u);xHeight(u,xHeight(u.parentNode)),xWidth(u,xWidth(u.parentNode));var v=xPageX(u),w=xPageY(u),x=parseInt(v,10)+parseInt(xWidth(u),10),y=parseInt(w,10)+parseInt(xHeight(u),10);if(a.xDPX>=v&&a.xDPX<=x&&a.xDPY>=w&&a.xDPY<=y&&D.hasClass("nullWidget")){var E=jQuery("div.widget_inner",D);return 0===E.size()?u.appendChild(a):E.get(0).appendChild(a),widgetManualEnd(),void(C=null)}}C=null}for(var s=xGetElementsByClassName("widgetOutput",zonePageObj),t=0;t<s.length;t++){var u=s[t],F=u.getAttribute("widget");if("widgetBox"!=F&&u.parentNode==zonePageObj){var v=xPageX(u),w=xPageY(u),x=parseInt(v,10)+parseInt(xWidth(u),10),y=parseInt(w,10)+parseInt(xHeight(u),10);if(a!=u&&a.xDPX>=v&&a.xDPX<=x&&a.xDPY>=w&&a.xDPY<=y&&a.parentNode==u.parentNode){var z=u.nextSibling;z||(z=u.parentNode.lastChild),z||(z=xCreateElement("DIV"),u.parentNode.appendChild(z));var A=a.nextSibling;return A||(A=xCreateElement("DIV"),a.parentNode.appendChild(A)),z&&z.parentNode.insertBefore(a,z),A&&A.parentNode.insertBefore(u,A),void(s=null)}}}s=null}}}function widgetDragEnd(a){var b=widgetGetTmpObject(a);widgetDisapear=widgetDisapearObject(b,a),widgetDragDisable(a.getAttribute("id"))}function widgetDisapearObject(a,b){xInnerHtml(b,xInnerHtml(a)),xInnerHtml(a,""),jQuery(a).hide(),a.parentNode.removeChild(a),widgetTmpObject[b.id]=null}function widgetMouseDown(a){for(var b=a.target;b&&!b.draggable;)b=xParent(b,!0);b&&(a.preventDefault(),b.xDPX=a.pageX,b.xDPY=a.pageY,widgetDragManager.obj=b,jQuery(document).on("mouseup",widgetMouseUp),b.dragStart&&b.dragStart(b,a.pageX,a.pageY))}function widgetMouseUp(a){widgetDragManager.obj&&(a.preventDefault(),jQuery(document).off("mouseup",widgetMouseUp),widgetDragManager.obj.dragEnd&&widgetDragManager.obj.dragEnd(widgetDragManager.obj,a.pageX,a.pageY),widgetDragManager.obj=null,widgetDragManager.isDrag=!1)}function widgetDragMouseMove(a){if(widgetDragManager.obj){a.preventDefault();var b=widgetDragManager.obj,c=a.pageX-b.xDPX,d=a.pageY-b.xDPY;b.xDPX=a.pageX,b.xDPY=a.pageY,b.drag?b.drag(b,c,d):xMoveTo(b,xLeft(b)+c,xTop(b)+d)}}function widgetDragDisable(a){if(widgetDragManager){var b=get_by_id(a);b.draggable=!1,b.dragStart=null,b.drag=null,b.dragEnd=null,jQuery(b).off("mousedown",widgetMouseDown)}}function widgetManualEnd(){var a=widgetDragManager.obj;if(a){jQuery(document).off("mouseup",widgetMouseUp),jQuery(document).on("mousemove",widgetDragMouseMove);var b=widgetGetTmpObject(a);widgetDisapear=widgetDisapearObject(b,a),widgetDragDisable(a.getAttribute("id")),widgetDragManager.obj=null,widgetDragManager.isDrag=!1}}var zonePageObj=null,zoneModuleSrl=0,selectedWidget=null,writedText=null,checkDocumentWrite=!1;window.document.write=window.document.writeln=function(a){if(checkDocumentWrite)return void(writedText=a);if(!a.match(/^<\//)){window.opera||(a=a.replace(/&(?![#a-z0-9]+;)/g,"&")),a=a.replace(/(<[a-z]+)/g,"$1 xmlns='http://www.w3.org/1999/xhtml'");var b,c=jQuery("<div>").html(a)[0];b=document.getElementsByTagName("*"),b=b[b.length-1];for(var d=c.childNodes;d.length;)b.parentNode.appendChild(d[0])}};var selectedSizeWidget=null;jQuery(function(a){a(document).keydown(function(b){var c=a(".jPicker.Container:visible");return 27!=b.which||c.length?27==b.which&&c.length?(c.hide(),!1):!0:(doHideWidgetSizeSetup(),!1)})});var hideElements=[],widgetDragManager={obj:null,isDrag:!1},widgetTmpObject=[],widgetDisappear=0,idStep=0;
\ No newline at end of file

From b7f94fc72b23b1233be7cc53101cd4fd4f66509b Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Thu, 8 May 2014 13:38:23 +0900
Subject: [PATCH 35/44] =?UTF-8?q?#665=20=ED=9A=8C=EC=9B=90=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EA=B3=84=EC=A0=95=20=EC=84=A4=EC=A0=95?=
 =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?=
 =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B2=80=EC=83=89=20=EC=A1=B0=EA=B1=B4=20?=
 =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/member/member.admin.view.php | 2 +-
 modules/member/tpl/member_list.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index c3b251d47..ab12df6d9 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -94,7 +94,7 @@ class memberAdminView extends member
 			}
 		}
 		$config = $this->memberConfig;
-		$memberIdentifiers = array('user_id'=>'user_id', 'user_name'=>'user_name', 'nick_name'=>'nick_name');
+		$memberIdentifiers = array('email_address'=>'email_address', 'user_id'=>'user_id', 'user_name'=>'user_name', 'nick_name'=>'nick_name');
 		$usedIdentifiers = array();	
 
 		if(is_array($config->signupForm))
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index c02b45f5f..dc8b5b45b 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -121,7 +121,7 @@
 		<!--@end-->
 	</select>
 	<select name="search_target" style="margin-right:4px" title="{$lang->search_target}">
-		{@$lang->search_target_list = array_merge($lang->search_target_list, $usedIdentifiers)}
+		{@$lang->search_target_list = array_merge($usedIdentifiers, $lang->search_target_list)}
 		<option value="{$key}" loop="$lang->search_target_list=>$key,$val" selected="selected"|cond="$search_target==$key">{$val}</option>
 	</select>
 	<input type="search" name="search_keyword" value="{htmlspecialchars($search_keyword, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" style="width:140px">

From b3432462a5336a1a02655ab542b3cb4d00066192 Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Thu, 8 May 2014 16:46:36 +0900
Subject: [PATCH 36/44] =?UTF-8?q?#675=20=EB=8C=93=EA=B8=80=EC=9D=84=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=A9=94=EC=9D=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=8B=A0=ED=95=9C=20=EA=B2=BD=EC=9A=B0=20=EB=A9=94?=
 =?UTF-8?q?=EC=9D=BC=EC=97=90=20=EC=9B=90=EB=B3=B8=EA=B8=80=20url=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/comment/comment.controller.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index 3ff6b2229..a16d4e1c8 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -520,6 +520,7 @@ class commentController extends comment
 			$oMail->setSender($obj->email_address, $obj->email_address);
 			$mail_title = "[XE - " . Context::get('mid') . "] A new comment was posted on document: \"" . $oDocument->getTitleText() . "\"";
 			$oMail->setTitle($mail_title);
+			$url_comment = getFullUrl('','document_srl',$obj->document_srl).'#comment_'.$obj->comment_srl;
 			if($using_validation)
 			{
 				$url_approve = getFullUrl('', 'module', 'comment', 'act', 'procCommentAdminChangePublishedStatusChecked', 'cart[]', $obj->comment_srl, 'will_publish', '1', 'search_target', 'is_published', 'search_keyword', 'N');
@@ -530,8 +531,11 @@ class commentController extends comment
 					<br />
 					Author: " . $member_info->nick_name . "
 					<br />Author e-mail: " . $member_info->email_address . "
+					<br />From : <a href=\"" . $url_comment . "\">" . $url_comment . "</a>
 					<br />Comment:
 					<br />\"" . $obj->content . "\"
+					<br />Document:
+					<br />\"" . $oDocument->getContentText(). "\"
 					<br />
 					<br />
 					Approve it: <a href=\"" . $url_approve . "\">" . $url_approve . "</a>
@@ -546,8 +550,11 @@ class commentController extends comment
 				$mail_content = "
 					Author: " . $member_info->nick_name . "
 					<br />Author e-mail: " . $member_info->email_address . "
+					<br />From : <a href=\"" . $url_comment . "\">" . $url_comment . "</a>
 					<br />Comment:
 					<br />\"" . $obj->content . "\"
+					<br />Document:
+					<br />\"" . $oDocument->getContentText(). "\"
 					";
 				$oMail->setContent($mail_content);
 

From 69d2bc74d429a4cd9d0744c42aebf1e76180a7b4 Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Thu, 8 May 2014 17:36:56 +0900
Subject: [PATCH 37/44] =?UTF-8?q?#689=20checkUserSequence=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9=EC=97=90=20=EC=9D=98=ED=95=9C=20=EA=B8=80,=EB=8C=93?=
 =?UTF-8?q?=EA=B8=80=20=EB=B3=B5=EA=B5=AC=20=EB=AC=B8=EC=A0=9C=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/comment/comment.controller.php   | 2 +-
 modules/document/document.controller.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index a16d4e1c8..5c2d30043 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -300,7 +300,7 @@ class commentController extends comment
 		{
 			$obj->comment_srl = getNextSequence();
 		}
-		elseif(!checkUserSequence($obj->comment_srl)) 
+		elseif(!$is_admin && !$manual_inserted && !checkUserSequence($obj->comment_srl)) 
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index f545e1339..0e3be0285 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -234,7 +234,7 @@ class documentController extends document
 		if(!$output->toBool()) return $output;
 		// Register it if no given document_srl exists
 		if(!$obj->document_srl) $obj->document_srl = getNextSequence();
-		elseif(!checkUserSequence($obj->document_srl)) return new Object(-1, 'msg_not_permitted');
+		elseif(!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) return new Object(-1, 'msg_not_permitted');
 
 		$oDocumentModel = getModel('document');
 		// Set to 0 if the category_srl doesn't exist

From 6c28f14bc237d1aefdf01658f85d5b702aaaea09 Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Thu, 8 May 2014 19:11:27 +0900
Subject: [PATCH 38/44] =?UTF-8?q?#690=20=ED=9C=B4=EC=A7=80=ED=86=B5?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=8C=93=EA=B8=80=20=EB=B3=B5=EC=9B=90?=
 =?UTF-8?q?=EC=8B=9C=20=EC=9E=91=EC=84=B1=EC=9E=90=EA=B0=80=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=EB=A1=9C=20=EB=B3=80=EA=B2=BD=EB=90=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/comment/comment.admin.controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php
index 019c6b52a..efb01180e 100644
--- a/modules/comment/comment.admin.controller.php
+++ b/modules/comment/comment.admin.controller.php
@@ -472,7 +472,7 @@ class commentAdminController extends comment
 		$obj->module_srl = $originObject->module_srl;
 
 		$oCommentController = getController('comment');
-		$output = $oCommentController->insertComment($obj);
+		$output = $oCommentController->insertComment($obj, true);
 
 		return $output;
 	}

From 8dcf9ee122f1057ba3f876410a72c98e5da4c471 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Fri, 9 May 2014 10:49:36 +0900
Subject: [PATCH 39/44] Update README.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

라이선스 표기 문제 수정
---
 README.md | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 722825333..2d9cf86ba 100644
--- a/README.md
+++ b/README.md
@@ -23,15 +23,16 @@ adrian.vasile.constantin, aerofleet, @akasima, @andreimarin, araste, @bnu, @bong
 ## License
 Copyright 2014 NAVER Corp. <http://www.navercorp.com>
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

From d71d5ba4b52ccc6774bce486e8eb5e405f4cebc1 Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Fri, 9 May 2014 11:00:11 +0900
Subject: [PATCH 40/44] =?UTF-8?q?#693=20=EB=8C=93=EA=B8=80=20=EC=8A=B9?=
 =?UTF-8?q?=EC=9D=B8=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EB=B0=9C=EC=86=A1?=
 =?UTF-8?q?=EC=8B=9C=20module=20=EA=B2=BD=EB=A1=9C=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/comment/comment.controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index 5c2d30043..54494e098 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -523,8 +523,8 @@ class commentController extends comment
 			$url_comment = getFullUrl('','document_srl',$obj->document_srl).'#comment_'.$obj->comment_srl;
 			if($using_validation)
 			{
-				$url_approve = getFullUrl('', 'module', 'comment', 'act', 'procCommentAdminChangePublishedStatusChecked', 'cart[]', $obj->comment_srl, 'will_publish', '1', 'search_target', 'is_published', 'search_keyword', 'N');
-				$url_trash = getFullUrl('', 'module', 'comment', 'act', 'procCommentAdminDeleteChecked', 'cart[]', $obj->comment_srl, 'search_target', 'is_trash', 'search_keyword', 'true');
+				$url_approve = getFullUrl('', 'module', 'admin', 'act', 'procCommentAdminChangePublishedStatusChecked', 'cart[]', $obj->comment_srl, 'will_publish', '1', 'search_target', 'is_published', 'search_keyword', 'N');
+				$url_trash = getFullUrl('', 'module', 'admin', 'act', 'procCommentAdminDeleteChecked', 'cart[]', $obj->comment_srl, 'search_target', 'is_trash', 'search_keyword', 'true');
 				$mail_content = "
 					A new comment on the document \"" . $oDocument->getTitleText() . "\" is waiting for your approval.
 					<br />

From 1aa5607a0a03b8b1787811339e0a2e8303d77929 Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Fri, 9 May 2014 17:49:51 +0900
Subject: [PATCH 41/44] =?UTF-8?q?#651=20file/ruleset/insertMember.xml=20?=
 =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/member/member.admin.controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index d2b185872..4b39da224 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -475,7 +475,7 @@ class memberAdminController extends member
 				}
 				else if($formInfo->name == 'password')
 				{
-					$fields[] = '<field name="password"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="length" value="6:20" /></field>';
+					$fields[] = '<field name="password"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="length" value="4:20" /></field>';
 					$fields[] = '<field name="password2"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="equalto" value="password" /></field>';
 				}
 				else if($formInfo->name == 'find_account_question')

From 64906ca3cdd1c85a27a076252aea91b71492753a Mon Sep 17 00:00:00 2001
From: Lansi <eoz754@naver.com>
Date: Sat, 10 May 2014 00:52:42 +0900
Subject: [PATCH 42/44] =?UTF-8?q?=EC=B6=94=EC=B2=9C=EC=88=98=20=EB=B0=8F?=
 =?UTF-8?q?=20=EB=B9=84=EC=B6=94=EC=B2=9C=EC=88=98=20=EB=A6=AC=ED=84=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updateVotedCount() 완료시 추천수 및 비추천수 리턴.
---
 modules/document/document.controller.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index f545e1339..0b31d9147 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -1143,14 +1143,19 @@ class documentController extends document
 		$_SESSION['voted_document'][$document_srl] = true;
 
 		// Return result
+		$output = new Object();
 		if($point > 0)
 		{
-			return new Object(0, 'success_voted');
+			$output->setMessage('success_voted');
+			$output->add('voted_count', $obj->after_point);
 		}
 		else
 		{
-			return new Object(0, 'success_blamed');
+			$output->setMessage('success_blamed');
+			$output->add('blamed_count', $obj->after_point);
 		}
+		
+		return $output;
 	}
 
 	/**

From 783cf8ccda68d1a350c6581e97a6d5ea2ef545d5 Mon Sep 17 00:00:00 2001
From: Lansi <eoz754@naver.com>
Date: Sat, 10 May 2014 01:01:11 +0900
Subject: [PATCH 43/44] =?UTF-8?q?=EC=B6=94=EC=B2=9C=EC=88=98=20=EB=B0=8F?=
 =?UTF-8?q?=20=EB=B9=84=EC=B6=94=EC=B2=9C=EC=88=98=20=EB=A6=AC=ED=84=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/comment/comment.controller.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index 3ff6b2229..9bba0f8fd 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -1100,7 +1100,17 @@ class commentController extends comment
 		$_SESSION['voted_comment'][$comment_srl] = TRUE;
 
 		// Return the result
-		return new Object(0, $success_message);
+		$output = new Object(0, $success_message);
+		if($point > 0)
+		{
+			$output->add('voted_count', $obj->after_point);
+		}
+		else
+		{
+			$output->add('blamed_count', $obj->after_point);
+		}
+
+		return $output;
 	}
 
 	/**

From 98de6e921f10448b05d9c8251263fbba4200b3e8 Mon Sep 17 00:00:00 2001
From: ngleader <ngleader@gmail.com>
Date: Sat, 10 May 2014 08:02:29 +0900
Subject: [PATCH 44/44] #695 fixed file extension filters

---
 modules/install/install.admin.controller.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php
index cb0a03ee8..f0f3bb6d2 100644
--- a/modules/install/install.admin.controller.php
+++ b/modules/install/install.admin.controller.php
@@ -335,8 +335,8 @@ class installAdminController extends install
 		list($width, $height, $type_no, $attrs) = @getimagesize($target_file);
 		if($iconname == 'favicon.ico')
 		{
-			if(!preg_match('/^.*(icon).*$/',$type)) {
-				Context::set('msg', '*.icon '.Context::getLang('msg_possible_only_file'));
+			if(!preg_match('/^.*\.ico$/i',$type)) {
+				Context::set('msg', '*.ico '.Context::getLang('msg_possible_only_file'));
 				return;
 			}
 			if($width && $height && ($width != '16' || $height != '16')) {
@@ -346,7 +346,7 @@ class installAdminController extends install
 		}
 		else if($iconname == 'mobicon.png')
 		{
-			if(!preg_match('/^.*(png).*$/',$type)) {
+			if(!preg_match('/^.*\.png$/i',$type)) {
 				Context::set('msg', '*.png '.Context::getLang('msg_possible_only_file'));
 				return;
 			}